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/03/20 16:49:32 UTC

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

Updated Branches:
  refs/heads/master fed89510e -> bbb9d7940


[webos] modulemapper refactor for platform plugins.


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

Branch: refs/heads/master
Commit: bbb9d79401b1198442522ceeb6cd6a8d93123104
Parents: fed8951
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 21 07:56:43 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Mar 20 11:42:18 2013 -0400

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


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/bbb9d794/lib/webos/platform.js
----------------------------------------------------------------------
diff --git a/lib/webos/platform.js b/lib/webos/platform.js
index 0182060..69626d0 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) {
@@ -99,26 +106,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"
-                }
-            }
-        }
     }
 };