cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject js commit: [Windows8][CB-3214] (cherry picked from commit 766ac951231b87c1a5ace025b20727fd8d9895e2)
Date Mon, 22 Apr 2013 23:19:03 GMT
Updated Branches:
  refs/heads/2.7.x 360bd3e65 -> 6d7a99bf1


[Windows8][CB-3214]
(cherry picked from commit 766ac951231b87c1a5ace025b20727fd8d9895e2)


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/6d7a99bf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/6d7a99bf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/6d7a99bf

Branch: refs/heads/2.7.x
Commit: 6d7a99bf18140fd8bb14163b561e08cf8909e92a
Parents: 360bd3e
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Mon Apr 22 16:16:50 2013 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Mon Apr 22 16:18:07 2013 -0700

----------------------------------------------------------------------
 lib/scripts/plugin_loader.js |    2 +-
 lib/windows8/platform.js     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/6d7a99bf/lib/scripts/plugin_loader.js
----------------------------------------------------------------------
diff --git a/lib/scripts/plugin_loader.js b/lib/scripts/plugin_loader.js
index 7cd65fb..601ac7b 100644
--- a/lib/scripts/plugin_loader.js
+++ b/lib/scripts/plugin_loader.js
@@ -99,7 +99,7 @@
         xhr.onload = function() {
             // If the response is a JSON string which composes an array, call handlePluginsObject.
             // If the request fails, or the response is not a JSON array, just call finishPluginLoading.
-            var obj = JSON.parse(this.responseText);
+            var obj = this.responseText && JSON.parse(this.responseText);
             if (obj && obj instanceof Array && obj.length > 0) {
                 handlePluginsObject(obj);
             } else {

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/6d7a99bf/lib/windows8/platform.js
----------------------------------------------------------------------
diff --git a/lib/windows8/platform.js b/lib/windows8/platform.js
index 211e62a..2e3618e 100755
--- a/lib/windows8/platform.js
+++ b/lib/windows8/platform.js
@@ -27,7 +27,7 @@ var cordova = require('cordova'),
 /*
  * Define native implementations ( there is no native layer, so need to make sure the proxies
are there )
  */
-modulemapper.loadMatchingModules(/cordova.*\/windows\/.*Proxy$/);
+modulemapper.loadMatchingModules(/cordova.*\/windows8\/.*Proxy$/);
 
 module.exports = {
     id: "windows8",
@@ -36,7 +36,7 @@ module.exports = {
         modulemapper.loadMatchingModules(/cordova.*\/plugininit$/);
 
         modulemapper.loadMatchingModules(/cordova.*\/symbols$/);
-        modulemapper.clobbers('/cordova/commandProxy', 'cordova.commandProxy');
+        modulemapper.clobbers('cordova/commandProxy', 'cordova.commandProxy');
 
         modulemapper.mapModules(window);
 


Mime
View raw message