incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deedu...@apache.org
Subject git commit: Move navigator.device to merges object for PlayBook.
Date Fri, 30 Mar 2012 18:45:46 GMT
Updated Branches:
  refs/heads/master 33f1fa37b -> c076f59d3


Move navigator.device to merges object for PlayBook.


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

Branch: refs/heads/master
Commit: c076f59d347f2c8f562cc7562818fc2af27dfc13
Parents: 33f1fa3
Author: Drew Walters <deedubbu@gmail.com>
Authored: Fri Mar 30 13:45:20 2012 -0500
Committer: Drew Walters <deedubbu@gmail.com>
Committed: Fri Mar 30 13:45:20 2012 -0500

----------------------------------------------------------------------
 lib/playbook/platform.js |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/c076f59d/lib/playbook/platform.js
----------------------------------------------------------------------
diff --git a/lib/playbook/platform.js b/lib/playbook/platform.js
index 4854f9b..3ea062b 100644
--- a/lib/playbook/platform.js
+++ b/lib/playbook/platform.js
@@ -2,15 +2,17 @@ module.exports = {
     id: "playbook",
     initialize:function() {},
     objects: {
+        device: {
+            path: "cordova/plugin/playbook/device"
+        }
+    },
+    merges: {
         navigator: {
             children: {
                 device: {
                     path: "cordova/plugin/playbook/device"
                 }
             }
-        },
-        device: {
-            path: "cordova/plugin/playbook/device"
         }
     }
 };


Mime
View raw message