Updated Modello web samples from upstream

Package version up (3.0.34).

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

diff --git a/package/changelog b/package/changelog
index 3aba2d7..989fd3b 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.34
+* Updated Modello web samples from upstream
+== Alice Liu <alice.liu@intel.com> 2014-12-22
+
 * 3.0.33
 * Updated Modello web samples from upstream
 == Alice Liu <alice.liu@intel.com> 2014-11-25

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 62e7d87..536cc41 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.33
+Version:3.0.34
 Maintainer: Alice Liu<alice.liu@intel.com>
 
 Package:ivi-3.0-web-sample

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/hvacControler.js b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/hvacControler.js
index 4f73598..e9435e1 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/hvacControler.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/hvacControler.js
@@ -453,11 +453,6 @@ hvacControler.prototype.initButtons = function() {
        "use strict";
        // Hazard
        $("#hazard_btn").bind('click', function() {
-               //This is temporary until AMB supports setting values from JS
-               bootstrap.carIndicator.status.hazard = !bootstrap.carIndicator.status.hazard;
-               hvacControler.prototype.onHazardChanged(bootstrap.carIndicator.status.hazard);
-               //TODO remove once functionality exists for each button
-
                bootstrap.carIndicator.setStatus("hazard", !bootstrap.carIndicator.status.hazard);
                bootstrap.carIndicator.setStatus("DirectionIndicationINST", !bootstrap.carIndicator.status.hazard ? 3 : 0);
                bootstrap.carIndicator.setStatus("DirectionIndicationMS", !bootstrap.carIndicator.status.hazard ? 3 : 0);
@@ -531,9 +526,6 @@ hvacControler.prototype.initButtons = function() {
        });
        // AirRecirculation
        $("#fan_control_circ").bind('click', function() {
-               bootstrap.carIndicator.status.airRecirculation = !bootstrap.carIndicator.status.airRecirculation;
-               hvacControler.prototype.onAirRecirculationChanged(bootstrap.carIndicator.status.airRecirculation);
-
                bootstrap.carIndicator.setStatus("airRecirculation", !bootstrap.carIndicator.status.airRecirculation);
                bootstrap.carIndicator.setStatus("RecircReq", !bootstrap.carIndicator.status.airRecirculation ? 1 : 0);
        });
@@ -553,28 +545,7 @@ hvacControler.prototype.initButtons = function() {
                        }
                        bootstrap.carIndicator.setStatus("seatHeaterRight", status);
 
-                       if (status === 0) {
-                               bootstrap.carIndicator.setStatus("HeatedSeatFRModeRequest", 3);
-                       } else {
-                               bootstrap.carIndicator.setStatus("HeatedSeatFRModeRequest", 0);
-                       }
-
-                       var request;
-
-                       switch (status) {
-                       case 0:
-                       case 1:
-                               request = status;
-                               break;
-                       case 2:
-                               request = 3;
-                               break;
-                       case 3:
-                               request = 5;
-                               break;
-                       }
-
-                       bootstrap.carIndicator.setStatus("HeatedSeatFRRequest", request);
+                       bootstrap.carIndicator.setStatus("HeatedSeatFRRequest", status);
                }
        });
        // SeatHeater - front left
@@ -592,36 +563,14 @@ hvacControler.prototype.initButtons = function() {
                                break;
                        }
                        bootstrap.carIndicator.setStatus("seatHeaterLeft", status);
-
-                       if (status === 0) {
-                               bootstrap.carIndicator.setStatus("HeatedSeatFLModeRequest", 3);
-                       } else {
-                               bootstrap.carIndicator.setStatus("HeatedSeatFLModeRequest", 0);
-                       }
-
-                       var request;
-
-                       switch (status) {
-                       case 0:
-                       case 1:
-                               request = status;
-                               break;
-                       case 2:
-                               request = 3;
-                               break;
-                       case 3:
-                               request = 5;
-                               break;
-                       }
-
-                       bootstrap.carIndicator.setStatus("HeatedSeatFLRequest", request);
+                       bootstrap.carIndicator.setStatus("HeatedSeatFLRequest", status);
                }
        });
        // AirflowDirection - FloorDuct - 1 (FOOT)
        $("#fan_dir_down_btn").bind('click', function() {
                var currentStatus = bootstrap.carIndicator.status.airflowDirection;
                                                                                                                //TODO removed temp until set is enabled
-               if ((currentStatus >= 0) && (currentStatus <= 7)){ // && (bootstrap.carIndicator.status.fanSpeed !== 0)) {
+               if ((currentStatus >= 0) && (currentStatus <= 7) && (bootstrap.carIndicator.status.fanSpeed !== 0)) {
                        var newStatus = changeAirflowDirectionStatus("#fan_dir_down_btn", currentStatus, 1);
                        hvacControler.prototype.onAirflowDirectionChanged(1);
                        setAirFlowDirectionStatus(newStatus);
@@ -630,7 +579,7 @@ hvacControler.prototype.initButtons = function() {
        // AirflowDirection - Defroster - 4 (SCREEN)
        $("#fan_dir_up_btn").bind('click', function() {
                var currentStatus = bootstrap.carIndicator.status.airflowDirection;
-               if ((currentStatus >= 0) && (currentStatus <= 7)){ // && (bootstrap.carIndicator.status.fanSpeed !== 0)) {
+               if ((currentStatus >= 0) && (currentStatus <= 7) && (bootstrap.carIndicator.status.fanSpeed !== 0)) {
                        var newStatus = changeAirflowDirectionStatus("#fan_dir_up_btn", currentStatus, 4);
                        hvacControler.prototype.onAirflowDirectionChanged(4);
                        setAirFlowDirectionStatus(newStatus);
@@ -639,7 +588,7 @@ hvacControler.prototype.initButtons = function() {
        // AirflowDirection - Front - 2 (FACE)
        $("#fan_dir_right_btn").bind('click', function() {
                var currentStatus = bootstrap.carIndicator.status.airflowDirection;
-               if ((currentStatus >= 0) && (currentStatus <= 7)){ // && (bootstrap.carIndicator.status.fanSpeed !== 0)) {
+               if ((currentStatus >= 0) && (currentStatus <= 7) && (bootstrap.carIndicator.status.fanSpeed !== 0)) {
                        var newStatus = changeAirflowDirectionStatus("#fan_dir_right_btn", currentStatus, 2);
                        hvacControler.prototype.onAirflowDirectionChanged(2);
                        setAirFlowDirectionStatus(newStatus);
@@ -671,16 +620,10 @@ hvacControler.prototype.initButtons = function() {
        });
        // Defrost - Rear
        $("#defrost_rear_btn").bind('click', function() {
-               bootstrap.carIndicator.status.rearDefrost = !bootstrap.carIndicator.status.rearDefrost;
-               hvacControler.prototype.onRearDefrostChanged(bootstrap.carIndicator.status.rearDefrost);
-
                bootstrap.carIndicator.setStatus("rearDefrost", !bootstrap.carIndicator.status.rearDefrost);
        });
        // Defrost - Front
        $("#defrost_front_btn").bind('click', function() {
-               bootstrap.carIndicator.status.frontDefrost = !bootstrap.carIndicator.status.frontDefrost;
-               hvacControler.prototype.onFrontDefrostChanged(bootstrap.carIndicator.status.frontDefrost);
-
                bootstrap.carIndicator.setStatus("frontDefrost", !bootstrap.carIndicator.status.frontDefrost);
        });
 };

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/main.js b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/main.js
index ec71843..d3aad6f 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/main.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/js/main.js
@@ -111,7 +111,6 @@ var init = function() {
                                        }
                                }
                                bootstrap.carIndicator.setStatus("targetTemperatureLeft", ($(this).val() + 29) - ($(this).val() * 2));
-                               bootstrap.carIndicator.setStatus("FrontTSetLeftCmd", ($(this).val() + 29) - ($(this).val() * 2));
                        }
                });
 
@@ -124,7 +123,6 @@ var init = function() {
                        orientation : "vertical",
                        slide : function() {
                                bootstrap.carIndicator.setStatus("targetTemperatureRight", ($(this).val() + 29) - ($(this).val() * 2));
-                               bootstrap.carIndicator.setStatus("FrontTSetRightCmd", ($(this).val() + 29) - ($(this).val() * 2));
                        }
                });
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes
index d0f6a1a..9b6ea01 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes
@@ -1,3 +1,9 @@
+* Mon Dec 15 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20141213.000015-1-g4163931
+- More set commands being implemented. Defrost, fanspeed, seat heater, and hazard
+
+* Fri Dec 12 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20141202.054127-1-ge1aa1a7
+- Updates to utilize AMB set calls
+
 * Mon Dec 01 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/3.0.m14.3/ivi/20141018.100009-1-gce7f5a8
 - Changed to use the navigator.vehicle namespace - TC-2055
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/main.js b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/main.js
index 328b8b2..02440c9 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/main.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/js/main.js
@@ -569,7 +569,6 @@ $(document).ready(
                             $("#noPairedDevice").show();
                         } else {
                             $("#noPairedDevice").hide();
-                            $("#loadingHistorySpinnerWrapper").show();
                             $(".caroufredsel_wrapper").show();
                         }
                     });
@@ -579,9 +578,10 @@ $(document).ready(
                             Phone.loadContacts(function(err) {
                                 if (!err) {
                                     ContactsLibrary.init();
+                                    $("#loadingHistorySpinnerWrapper").show();
                                     Phone.loadCallHistory(function(err) {
+                                        $("#loadingHistorySpinnerWrapper").hide();
                                         if (!err) {
-                                            $("#loadingHistorySpinnerWrapper").hide();
                                             callHistoryCarousel.loadCallHistory(Phone.callHistory(), 0);
                                         }
                                     });
@@ -608,8 +608,8 @@ $(document).ready(
                         if (acceptPhoneCallFromOtherWidget !== true) {
                             window.setTimeout(function() {
                                 Phone.loadCallHistory(function(err) {
+                                    $("#loadingHistorySpinnerWrapper").hide();
                                     if (!err) {
-                                        $("#loadingHistorySpinnerWrapper").hide();
                                         callHistoryCarousel.loadCallHistory(Phone.callHistory(), 0);
 
                                     }

diff --git a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes
index f37d026..c82574b 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes
@@ -1,3 +1,6 @@
+* Thu Dec 11 2014 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/ivi/20141208.013020-1-gcd10124
+- Fix download history spinner sometimes not hiding correctly
+
 * Fri Dec 05 2014 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/3.0.m14.3/ivi/20141018.100013-3-g927cca8
 - Fix TC-1906 - no call time recording when answering without phone launched