You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/01/29 20:07:51 UTC

[31/37] js commit: [webos] modulemapper refactor for platform plugins.

[webos] modulemapper refactor for platform plugins.

https://issues.apache.org/jira/browse/CB-2227


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

Branch: refs/heads/symbolmapping
Commit: cdf100332232ae6abd275f9facf354ec00b41fdf
Parents: 765134e
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jan 25 15:42:48 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Jan 28 19:57:04 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/cdf10033/lib/webos/platform.js
----------------------------------------------------------------------
diff --git a/lib/webos/platform.js b/lib/webos/platform.js
index 49ee383..13de8a9 100644
--- a/lib/webos/platform.js
+++ b/lib/webos/platform.js
@@ -28,6 +28,13 @@ 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) {
@@ -98,26 +105,5 @@ 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"
-                }
-            }
-        }
     }
 };