Updated Modello web samples from upstream

Package version up (3.0.36).

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

diff --git a/package/changelog b/package/changelog
index 2e95ee9..514927e 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,8 @@
+* 3.0.36
+* Updated Modello web samples from upstream
+* Removed GhostCluster which is not maintained
+== Alice Liu <alice.liu@intel.com> 2015-01-06
+
 * 3.0.35
 * Updated Modello web samples from upstream
 == Alice Liu <alice.liu@intel.com> 2014-12-23

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index d435dbe..aa81319 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.35
+Version:3.0.36
 Maintainer: Alice Liu<alice.liu@intel.com>
 
 Package:ivi-3.0-web-sample

diff --git a/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/js/main.js b/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/js/main.js
index d9b175b..663d76d 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/js/main.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/js/main.js
@@ -144,7 +144,7 @@ function enhanceModelUrls(model) {
 function getAppIcon(appIconPath, callback) {
        "use strict";
        try {
-               tizen.filesystem.resolve(appIconPath, function (iconFile) {
+               tizen.filesystem.resolve("file://"+appIconPath, function (iconFile) {
                        callback(iconFile.fullPath);
                }, function (error) {
                        callback(Config.defaultIcon);
@@ -396,4 +396,4 @@ function openStoreLibrary() {
                StoreLibrary.show();
        }
        setThemeIconColorBeforeRender(AppModel);
-}
\ No newline at end of file
+}

diff --git a/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/js/remotecontent.js b/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/js/remotecontent.js
index 08a47aa..46e9eaa 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/js/remotecontent.js
+++ b/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/js/remotecontent.js
@@ -64,9 +64,9 @@ RemoteContent.prototype.scanMediaServerNetwork = function() {
        if (!!self.mediaServer) {
                self.clearDisappearedMediaSources();
 
-               self.mediaServer.addEventListener('serverfound', function(source) {
+               self.mediaServer.onserverfound = function(source) {
                         self.addMediaSource(source.server);
-                });
+                };
                self.mediaServer.scanNetwork();
        }
 };