Updated Modello Common libraries; version up

Change-Id: I2039708ca1dfbb40e570872ac624f96db33e42e5
Signed-off-by: Alice Liu <alice.liu@intel.com>

diff --git a/package/changelog b/package/changelog
index d0d57ed..6a67cac 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.26
+- Updated Modello Common libraries
+== Alice Liu <alice.liu@intel.com> 2014-08-22
+
 * 3.0.25
 - Removed Close item on IVI skin
 == Alice Liu <alice.liu@intel.com> 2014-08-12

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 9f921df..e8113ac 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.25
+Version:3.0.26
 Maintainer: Wenchao Wang<wenchao.wang@intel.com>
 
 Package:ivi-3.0-web-add-ons

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/car.css b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/car.css
index a8f94a4..fd608fe 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/car.css
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/car.css
@@ -3,19 +3,18 @@
 /* This is theme aimed for Intel Coulomb 2012 */
 @font-face {
        font-family: HelveticaNeue;
-
-       src: url('./fonts/HelveticaNeue-Regular.eot?#iefix') format('embedded-opentype'),
+       src: url('./fonts/HelveticaNeue-Regular.ttf')  format('truetype'),
+            url('./fonts/HelveticaNeue-Regular.eot?#iefix') format('embedded-opentype'),
             url('./fonts/HelveticaNeue-Regular.woff') format('woff'),
-            url('./fonts/HelveticaNeue-Regular.ttf')  format('truetype'),
             url('./fonts/HelveticaNeue-Regular.svg#svgFontName') format('svg'),
             local("HelveticaNeue");
 }
 
 @font-face {
        font-family: HelveticaNeue;
-       src: url('./fonts/HelveticaNeue-CondensedBold.eot?#iefix') format('embedded-opentype'),
+       src: url('./fonts/HelveticaNeue-CondensedBold.ttf')  format('truetype'),
+            url('./fonts/HelveticaNeue-CondensedBold.eot?#iefix') format('embedded-opentype'),
             url('./fonts/HelveticaNeue-CondensedBold.woff') format('woff'),
-            url('./fonts/HelveticaNeue-CondensedBold.ttf')  format('truetype'),
             url('./fonts/HelveticaNeue-CondensedBold.svg#svgFontName') format('svg'),
             local("HelveticaNeue");
 
@@ -24,9 +23,9 @@
 
 @font-face {
        font-family: HelveticaNeue;
-       src: url('./fonts/HelveticaNeue-Light.eot?#iefix') format('embedded-opentype'),
+       src: url('./fonts/HelveticaNeue-Light.ttf')  format('truetype'),
+            url('./fonts/HelveticaNeue-Light.eot?#iefix') format('embedded-opentype'),
             url('./fonts/HelveticaNeue-Light.woff') format('woff'),
-            url('./fonts/HelveticaNeue-Light.ttf')  format('truetype'),
             url('./fonts/HelveticaNeue-Light.svg#svgFontName') format('svg'),
             local("HelveticaNeue");
 
@@ -254,4 +253,4 @@ input {
 .inputBox .nextButton:active {
        top: 1px;
        right: 1px;
-}
\ No newline at end of file
+}

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/bottomPanel/bottomPanel.js b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/bottomPanel/bottomPanel.js
index 6110fc4..cf8af44 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/bottomPanel/bottomPanel.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/bottomPanel/bottomPanel.js
@@ -45,7 +45,7 @@
              */
             onBackButtonClick: function () {
                 BottomPanel.thisObj.trigger("clickOnBackButton");
-                if (typeof tizen !== "undefined") {
+                if (typeof (tizen.application.getCurrentApplication) !== "undefined") {
                     tizen.application.getCurrentApplication().exit();
                 }
             }

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/settings/js/bluetooth.js b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/settings/js/bluetooth.js
index 4a07668..704747d 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/settings/js/bluetooth.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/settings/js/bluetooth.js
@@ -267,37 +267,37 @@ var Bluetooth = function() {
        this.getDeviceClassStr = function(deviceClass) {
                var classStr = "";
                switch (deviceClass.major) {
-               case tizen.bt.deviceMajor.MISC:
+               case tizen.bluetooth.deviceMajor.MISC:
                        classStr = "MISC";
                        break;
-               case tizen.bt.deviceMajor.COMPUTER:
+               case tizen.bluetooth.deviceMajor.COMPUTER:
                        classStr = "COMPUTER";
                        break;
-               case tizen.bt.deviceMajor.PHONE:
+               case tizen.bluetooth.deviceMajor.PHONE:
                        classStr = "PHONE";
                        break;
-               case tizen.bt.deviceMajor.NETWORK:
+               case tizen.bluetooth.deviceMajor.NETWORK:
                        classStr = "NETWORK";
                        break;
-               case tizen.bt.deviceMajor.AUDIO_VIDEO:
+               case tizen.bluetooth.deviceMajor.AUDIO_VIDEO:
                        classStr = "AUDIO/VIDEO";
                        break;
-               case tizen.bt.deviceMajor.PERIPHERAL:
+               case tizen.bluetooth.deviceMajor.PERIPHERAL:
                        classStr = "PERIPHERAL";
                        break;
-               case tizen.bt.deviceMajor.IMAGING:
+               case tizen.bluetooth.deviceMajor.IMAGING:
                        classStr = "IMAGING";
                        break;
-               case tizen.bt.deviceMajor.WEARABLE:
+               case tizen.bluetooth.deviceMajor.WEARABLE:
                        classStr = "WEARABLE";
                        break;
-               case tizen.bt.deviceMajor.TOY:
+               case tizen.bluetooth.deviceMajor.TOY:
                        classStr = "TOY";
                        break;
-               case tizen.bt.deviceMajor.HEALTH:
+               case tizen.bluetooth.deviceMajor.HEALTH:
                        classStr = "HEALTH";
                        break;
-               case tizen.bt.deviceMajor.UNCATEGORIZED:
+               case tizen.bluetooth.deviceMajor.UNCATEGORIZED:
                        classStr = "UNCATEGORIZED";
                        break;
                default:
@@ -332,7 +332,7 @@ var Bluetooth = function() {
                        if (self.isDeviceSelected(self.selectedDevice())) {
                                return true;
                        }
-                       if (!!self.selectedDevice().isBonded && !!self.selectedDevice().address && !!self.selectedDevice().deviceClass && self.selectedDevice().deviceClass.major === tizen.bt.deviceMajor.PHONE) {
+                       if (!!self.selectedDevice().isBonded && !!self.selectedDevice().address && !!self.selectedDevice().deviceClass && self.selectedDevice().deviceClass.major === tizen.bluetooth.deviceMajor.PHONE) {
                                return true;
                        }
                }
@@ -465,7 +465,7 @@ Bluetooth.prototype.loadBluetoothConfig = function() {
        if (!!bluetooth) {
                self.lastSync(bluetooth.lastSync);
                if (!!self.adapter() && self.adapter().powered && !!bluetooth.devices) {
-                       self.devices(bluetooth.devices);
+                       self.clearDevices();
                        self.refreshDevices();
                        self._setRefreshDevicesInterval();
                }
@@ -486,7 +486,7 @@ Bluetooth.prototype.getDevice = function(device) {
                self.addUpdateDevice(dev, false);
                self.sortDevices();
                self.saveBluetooth();
-               if (self.selectedDevice().address === dev.address) {
+               if (!!self.selectedDevice() && self.selectedDevice().address === dev.address) {
                        self.selectedDevice(dev);
                }
        }, function(error) {
@@ -506,9 +506,9 @@ Bluetooth.prototype.getDevice = function(device) {
 Bluetooth.prototype.loadDefaultAdapter = function() {
        "use strict";
        var self = this;
-       if (typeof (tizen.bt) !== 'undefined' && typeof (tizen.bt.getDefaultAdapter) !== 'undefined') {
+       if (typeof (tizen.bluetooth) !== 'undefined' && typeof (tizen.bluetooth.getDefaultAdapter) !== 'undefined') {
                try {
-                       var adapter = tizen.bt.getDefaultAdapter();
+                       var adapter = tizen.bluetooth.getDefaultAdapter();
                        if (adapter === null) {
                                console.log('Error: Bluetooth adapter not found');
                        } else {
@@ -945,7 +945,7 @@ Bluetooth.prototype.selectRemoteDevice = function(device) {
        "use strict";
        var self = this;
        console.log("selectRemoteDevice called", device);
-       if (!!device && !!device.address && !!device.deviceClass && device.deviceClass.major === tizen.bt.deviceMajor.PHONE && typeof (tizen.phone) !== 'undefined' && typeof (tizen.phone.selectRemoteDevice) !== 'undefined') {
+       if (!!device && !!device.address && !!device.deviceClass && device.deviceClass.major === tizen.bluetooth.deviceMajor.PHONE && typeof (tizen.phone) !== 'undefined' && typeof (tizen.phone.selectRemoteDevice) !== 'undefined') {
                showLoadingSpinner("Selecting");
                try {
                        tizen.phone.selectRemoteDevice(device.address);

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/topBarIcons/topBarIcons.js b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/topBarIcons/topBarIcons.js
index ae4d650..a7be155 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/topBarIcons/topBarIcons.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/css/car/components/topBarIcons/topBarIcons.js
@@ -168,7 +168,7 @@ function launchApplication(id) {
                 */
                init: function() {
                        TopBarIcons.initLaunchingAppsByVoiceRecognition();
-                       TopBarIcons.runningAppName = typeof(tizen) === 'undefined' ? "" : tizen.application.getCurrentApplication().appInfo.id;
+                       TopBarIcons.runningAppName = typeof(tizen.application.getCurrentApplication) === 'undefined' ? "" : tizen.application.getCurrentApplication().appInfo.id;
 
                        this.empty();
                        this.addClass("topBarIcons");
@@ -186,7 +186,7 @@ function launchApplication(id) {
 
                _getApps: function() {
                        try {
-                               if (typeof(tizen) !== 'undefined') {
+                               if (typeof(tizen.application.getAppsInfo) !== 'undefined') {
                                        tizen.application.getAppsInfo(TopBarIcons.onAppInfoSuccess, function(err) {
                                                // Workaround due to https://bugs.tizen.org/jira/browse/TIVI-2018
                                                window.setTimeout(function() {

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js
index c30504a..896aac9 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/carIndicator.js
@@ -474,7 +474,8 @@ CarIndicator.prototype.addListener = function(aCallbackObject) {
                                                                                self.onDataUpdate(setUpData, self, id);
                                                                }
                                                        }
-                                                       tizen.vehicle[subscribeName].subscribe(subscribeCallback, zone);
+                                                       //subscribe isn't supported yet, will re-enable once it is
+                                                       //tizen.vehicle[subscribeName].subscribe(subscribeCallback, zone);
                                                } else {
                                                        console.warn("Tizen API is not available, cannot subscribe to signal", signal);
                                                }

diff --git a/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/speech.js b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/speech.js
index 0787c30..e8aafba 100644 (file)
--- a/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/speech.js
+++ b/web-ui-fw/0.0.2/0.0.2_Common/original/js/services/speech.js
@@ -52,9 +52,8 @@ var Speech = (function() {
        Speech.prototype._initVoiceRecognition = function() {
                var self = this;
                console.log("Speech init voice recognition called.");
-               if (typeof (tizen) !== 'undefined' && typeof (tizen.speech) !== 'undefined' && typeof (tizen.speech.setCBListener) !== 'undefined') {
+               if (typeof (tizen.speech.setCBListener) !== 'undefined') {
                        try {
-
                                tizen.speech.setCBListener(function(result) {
                                                console.log("Speech: onresult received");
                                                for ( var i = 0; i < result.length; i++) {
@@ -190,7 +189,7 @@ var Speech = (function() {
         */
        Speech.prototype.vocalizeString = function(string) {
                console.log("Speech vocalize string called.");
-               if (typeof (tizen) !== 'undefined' && typeof (tizen.speech) !== 'undefined' && typeof (tizen.speech.vocalizeString) !== 'undefined') {
+               if (typeof (tizen.speech.vocalizeString) !== 'undefined') {
                        try {
                                tizen.speech.vocalizeString(string);
                        } catch (err) {
@@ -208,9 +207,9 @@ var Speech = (function() {
         * @method readCurrentAppName
         */
        Speech.prototype.readCurrentAppName = function() {
-               if (typeof (tizen) !== 'undefined') {
+               if (typeof (tizen.application.getCurrentApplication) !== 'undefined') {
                        var appName = tizen.application.getCurrentApplication().appInfo.name.toString().trim().toLowerCase();
-                       if (appName === "hvac") {
+                       if (appName === "modello hvac") {
                                appName = "air conditioning";
                        }
                        this.vocalizeString(appName);