Updated Modello web samples from upstream; version up

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

diff --git a/package/changelog b/package/changelog
index c771bc6..8142a03 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.19
+* Updated Modello web samples from upstream
+== Alice Liu <alice.liu@intel.com> 2014-07-23
+
 * 3.0.18
 * Updated Modello_Nav snapshot
 == Dongxing Liu <dongxing.x.liu@intel.com> 2014-07-10

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 6167f7b..f4633a8 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
-Version:3.0.18
-Maintainer: Dongxing Liu<dongxing.x.liu@intel.com>
+Version:3.0.19
+Maintainer: Alice Liu<alice.liu@intel.com>
 
 Package:ivi-3.0-web-sample
 OS:ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64

diff --git a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/Homescreen_icon.png b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/Homescreen_icon.png
index 0b2f067..b0ce7ea 100644 (file)
Binary files a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/Homescreen_icon.png and b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/Homescreen_icon.png differ

diff --git a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/systemd/modello_launcher.sh b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/systemd/modello_launcher.sh
index 5d1e02e..13eb2a4 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/systemd/modello_launcher.sh
+++ b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/systemd/modello_launcher.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-xwalk-launcher gomjednplfobbadlpflcmcglndlenbep -f
+open_app xwalk.gomjednplfobbadlpflcmcglndlenbep
+#xwalk-launcher gomjednplfobbadlpflcmcglndlenbep -f

diff --git a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/js/remotecontent.js b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/js/remotecontent.js
index c8b0563..08a47aa 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/js/remotecontent.js
+++ b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/js/remotecontent.js
@@ -13,7 +13,7 @@
 var RemoteContent = function() {
        "use strict";
        var self = this;
-       this.mediaServer = navigator.mediaServer; //tizen.mediaserver;
+       this.mediaServer = navigator.mediaServer;
        this.mediaSources = ko.observableArray([]);
        this.selectedMediaSource = ko.observable(null);
 
@@ -83,10 +83,7 @@ RemoteContent.prototype.addMediaSource = function(source) {
        console.log(source);
        if (!!source) {
                if (!source.friendlyName) {
-                       for(var key in source) {
-                           var value = source[key];
-                           if (source.hasOwnProperty(key))
-                       }
+                       return;
                }
                source.timestamp = new Date().getTime();
                var sourceExists = false;

diff --git a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.changes b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.changes
index a8117c5..c8d7ccc 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.changes
+++ b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.changes
@@ -1,3 +1,6 @@
+* Mon Jul 07 2014 brianjjones <brian.j.jones@intel.com> accepted/tizen/ivi/20140702.153244-1-g3435640
+- Removing faulty debug code and commented coded
+
 * Thu Jun 26 2014 brianjjones <brian.j.jones@intel.com> accepted/tizen/ivi/20140526.130731-1-g635ff71
 - Updates to use the slightly altered mediaserver API