Fixed bug TC-2300, TC-2358, TC-2359

Package version up (2.0.50).

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

diff --git a/package/changelog b/package/changelog
index 8870be0..1827300 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.0.50
+- Fixed bug TC-2300, TC-2358, TC-2359
+== Alice Liu <alice.liu@intel.com> 2015-01-21 15:25
 * 2.0.49
 - Fixed bug TC-2311 and added speechSynthesis
 interface to Speech module.

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index eeaaefa..5f6edb6 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.0.49
+Version:2.0.50
 Maintainer:hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>
 
 Package:websimulator-core

diff --git a/web/cache.manifest b/web/cache.manifest
index dca3a12..b805fce 100644 (file)
--- a/web/cache.manifest
+++ b/web/cache.manifest
@@ -108,4 +108,4 @@ themes/light/images/ui-icons_454545_256x240.png
 themes/light/images/ui-icons_888888_256x240.png
 themes/light/images/ui-icons_cd0a0a_256x240.png
 themes/light/theme.css
-# Manifest build date: Thu Jan 15 2015 21:12:52 GMT+0800 (CST)
\ No newline at end of file
+# Manifest build date: Wed Jan 21 2015 15:24:15 GMT+0800 (CST)
\ No newline at end of file

diff --git a/web/ripple.js b/web/ripple.js
index 3b93f36..c45d68b 100644 (file)
--- a/web/ripple.js
+++ b/web/ripple.js
@@ -1,5 +1,5 @@
 /*! 
-  Ripple Mobile Environment Emulator v0.9.8 :: Built On Thu Jan 15 2015 21:12:51 GMT+0800 (CST)
+  Ripple Mobile Environment Emulator v0.9.8 :: Built On Wed Jan 21 2015 15:24:14 GMT+0800 (CST)
 
                                 Apache License
                            Version 2.0, January 2004
@@ -74693,6 +74693,15 @@ module.exports = {
                 if (key === "navigator") {
                     window[key].vehicle = win[key].vehicle = obj.vehicle;
                     window[key].mediaServer = win[key].mediaServer = obj.mediaserver;
+                    window[key].battery = win[key].battery = obj.battery;
+
+                    win.navigator.__defineGetter__('vehicle', function () {
+                        return obj.vehicle;
+                    });
+
+                    win.navigator.__defineGetter__('mediaServer', function () {
+                        return obj.mediaserver;
+                    });
                 }
             },
             currentPlatform = platform.current(),
@@ -79088,6 +79097,7 @@ function _initialize() {
     _data.mediaServer.items = items;
     _data.mediaServer.onserverfound = null;
     _data.mediaServer.onserverlost = null;
+    _data.mediaServer.serverobject = null;
 }
 
 function _setRoot() {
@@ -79341,7 +79351,8 @@ _self = function () {
             }
 
             if (mediaserver.onserverfound != null) {
-                mediaserver.onserverfound(new MediaServer(_data.mediaServer.server));
+                _data.mediaServer.serverobject = new MediaServer(_data.mediaServer.server);
+                mediaserver.onserverfound(_data.mediaServer.serverobject);
             }
 
             if (mediaserver.onserverlost != null) {
@@ -79407,11 +79418,12 @@ MediaServer = function (obj) {
     mediaServer.iconURL = obj.iconURL || "";
     mediaServer.deviceType = obj.deviceType || "";
     mediaServer.root = obj.root || null;
-    mediaServer.canCreateContainer = obj.canCreateContainer || false;
-    mediaServer.canUpload = obj.canUpload || false;
+    mediaServer.canCreateContainer = obj.canCreateContainer || true;
+    mediaServer.canUpload = obj.canUpload || true;
     mediaServer.searchAttrs = obj.searchAttrs || [];
     mediaServer.sortAttrs = obj.sortAttrs || [];
     mediaServer.server = this || null;
+    mediaServer.oncontainerchanged = obj.oncontainerchanged || null;
 
     this.__defineGetter__("id", function () {
         return mediaServer.id;
@@ -79485,6 +79497,17 @@ MediaServer = function (obj) {
         return mediaServer.sortAttrs;
     });
 
+    this.__defineGetter__("oncontainerchanged", function () {
+        return mediaServer.oncontainerchanged;
+    });
+
+    this.__defineSetter__("oncontainerchanged", function (val) {
+        try {
+            mediaServer.oncontainerchanged = t.Callback(val, "?");
+        } catch (e) {
+        }
+    });
+
     this.upload = function (path) {
         if (!this.canUpload) {
             throw new WebAPIException(errorcode.PERMISSION_DENIED);
@@ -79493,6 +79516,11 @@ MediaServer = function (obj) {
         t.MediaServer("upload", arguments);
 
         // upload
+        return {
+            then: function(successCallback, errorCallback) {
+                successCallback();
+            }
+        };
     };
 
     this.createFolder = function (title) {
@@ -79503,6 +79531,11 @@ MediaServer = function (obj) {
         t.MediaServer("createFolder", arguments);
 
         // createFolder
+        return {
+            then: function(successCallback, errorCallback) {
+                successCallback();
+            }
+        };
     };
 
     this.cancel = function () {
@@ -79642,9 +79675,6 @@ MediaServer = function (obj) {
 
     };
 
-    this.oncontainerchanged = function () {
-        //oncontainerchanged
-    };
 };
 
 MediaFactory = function (type, property) {
@@ -79695,9 +79725,9 @@ MediaContainer = function (property) {
     MediaObject.call(this, property);
 
     mediaContainer.childCount = property.childCount || 0;
-    mediaContainer.canCreateContainer = property.canCreateContainer || false;
+    mediaContainer.canCreateContainer = property.canCreateContainer || true
     mediaContainer.canDelete = property.canDelete || false;
-    mediaContainer.canUpload = property.canUpload || false;
+    mediaContainer.canUpload = property.canUpload || true;
     mediaContainer.canRename = property.canRename || false;
 
     this.__defineGetter__("childCount", function () {
@@ -79728,6 +79758,11 @@ MediaContainer = function (property) {
         t.MediaContainer("upload", arguments);
 
         // upload
+        return {
+            then: function(successCallback, errorCallback) {
+                successCallback();
+            }
+        };
     };
 
     this.createFolder = function (title) {
@@ -79738,6 +79773,17 @@ MediaContainer = function (property) {
         t.MediaContainer("createFolder", arguments);
 
         // createFolder
+        return {
+            then: function(successCallback, errorCallback) {
+                successCallback();
+                window.setTimeout(function() {
+                    var oncontainerchanged = _data.mediaServer.serverobject.oncontainerchanged;
+                    if (oncontainerchanged !== null) {
+                        oncontainerchanged(new MediaObject({'id':property.id}));
+                    }
+                },1);
+            }
+        };
     };
 };
 
@@ -106277,6 +106323,7 @@ var _original = window.navigator,
     builder.build(platform.current().objects).into(sandbox);
     nav.vehicle = sandbox.navigator.vehicle;
     nav.mediaServer = sandbox.navigator.mediaserver;
+    nav.battery = sandbox.navigator.battery;
 
     for (key in nav) {
         _self[key] = _handle(nav, key);