cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [9/9] js commit: Revert "[webos] modulemapper refactor for platform plugins."
Date Thu, 21 Feb 2013 12:56:00 GMT
Updated Branches:
  refs/heads/master 1de6aaf71 -> c21844229


Revert "[webos] modulemapper refactor for platform plugins."

This reverts commit fd442973a5f963e1fdda2b9b97b7ac3b1644a237.


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

Branch: refs/heads/master
Commit: c21844229f879c1b726f22a3a9cbefdbc3657022
Parents: b5f8842
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Thu Feb 21 07:55:19 2013 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Feb 21 07:55:19 2013 -0500

----------------------------------------------------------------------
 lib/webos/platform.js |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c2184422/lib/webos/platform.js
----------------------------------------------------------------------
diff --git a/lib/webos/platform.js b/lib/webos/platform.js
index 69626d0..0182060 100644
--- a/lib/webos/platform.js
+++ b/lib/webos/platform.js
@@ -28,13 +28,6 @@ module.exports = {
         var modulemapper = require('cordova/modulemapper');
 
         modulemapper.loadMatchingModules(/cordova.*\/symbols$/);
-
-        modulemapper.merges('cordova/plugin/webos/service', 'navigator.service');
-        modulemapper.merges('cordova/plugin/webos/application', 'navigator.application');
-        modulemapper.merges('cordova/plugin/webos/window', 'navigator.window');
-        modulemapper.merges('cordova/plugin/webos/orientation', 'navigator.orientation');
-        modulemapper.merges('cordova/plugin/webos/keyboard', 'navigator.keyboard');
-
         modulemapper.mapModules(window);
 
         if (window.PalmSystem) {
@@ -106,5 +99,26 @@ module.exports = {
             });
 
         });
+    },
+    merges: {
+        navigator: {
+            children: {
+                service: {
+                    path: "cordova/plugin/webos/service"
+                },
+                application: {
+                    path: "cordova/plugin/webos/application"
+                },
+                window: {
+                    path: "cordova/plugin/webos/window"
+                },
+                orientation: {
+                    path: "cordova/plugin/webos/orientation"
+                },
+                keyboard: {
+                    path: "cordova/plugin/webos/keyboard"
+                }
+            }
+        }
     }
 };


Mime
View raw message