incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From becka...@apache.org
Subject js commit: Update to CB-56 CameraPopoverOptions
Date Mon, 04 Jun 2012 18:41:43 GMT
Updated Branches:
  refs/heads/master b9dcff467 -> ea6b03d7b


Update to CB-56 CameraPopoverOptions

Moved CameraPopoverOptions from iOS only to common.
This allows Cordova users to write common JavaScript code for
Camera usage across platforms with out checking for existence
of platform specific options.


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/ea6b03d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/ea6b03d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/ea6b03d7

Branch: refs/heads/master
Commit: ea6b03d7b6a6e2a41ffc5803376eab40a439240c
Parents: b9dcff4
Author: Becky Gibson <becka11y@apache.org>
Authored: Mon Jun 4 14:33:20 2012 -0400
Committer: Becky Gibson <becka11y@apache.org>
Committed: Mon Jun 4 14:33:20 2012 -0400

----------------------------------------------------------------------
 lib/common/common.js                       |    3 +++
 lib/common/plugin/CameraPopoverOptions.js  |   16 ++++++++++++++++
 lib/ios/platform.js                        |    3 ---
 lib/ios/plugin/ios/CameraPopoverOptions.js |   16 ----------------
 4 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/ea6b03d7/lib/common/common.js
----------------------------------------------------------------------
diff --git a/lib/common/common.js b/lib/common/common.js
index 3e85e42..25a921d 100644
--- a/lib/common/common.js
+++ b/lib/common/common.js
@@ -73,6 +73,9 @@ module.exports = {
         Camera:{
             path: 'cordova/plugin/CameraConstants'
         },
+        CameraPopoverOptions: {
+            path: 'cordova/plugin/CameraPopoverOptions'
+        },
         CaptureError: {
             path: 'cordova/plugin/CaptureError'
         },

http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/ea6b03d7/lib/common/plugin/CameraPopoverOptions.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/CameraPopoverOptions.js b/lib/common/plugin/CameraPopoverOptions.js
new file mode 100644
index 0000000..a74b36b
--- /dev/null
+++ b/lib/common/plugin/CameraPopoverOptions.js
@@ -0,0 +1,16 @@
+var Camera = require('cordova/plugin/CameraConstants');
+
+/**
+ * Encapsulates options for iOS Popover image picker
+ */
+var CameraPopoverOptions = function(x,y,width,height,arrowDir){
+    // information of rectangle that popover should be anchored to
+    this.x = x || 0;
+    this.y = y || 32;
+    this.width = width || 320;
+    this.height = height || 480;
+    // The direction of the popover arrow
+    this.arrowDir = arrowDir || Camera.PopoverArrowDirection.ARROW_ANY;
+};
+
+module.exports = CameraPopoverOptions;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/ea6b03d7/lib/ios/platform.js
----------------------------------------------------------------------
diff --git a/lib/ios/platform.js b/lib/ios/platform.js
index ed99819..128b2c2 100644
--- a/lib/ios/platform.js
+++ b/lib/ios/platform.js
@@ -21,9 +21,6 @@ module.exports = {
         },
         console: {
             path: 'cordova/plugin/ios/console'
-        },
-        CameraPopoverOptions: {
-            path: 'cordova/plugin/ios/CameraPopoverOptions'
         }
     },
     merges:{

http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/ea6b03d7/lib/ios/plugin/ios/CameraPopoverOptions.js
----------------------------------------------------------------------
diff --git a/lib/ios/plugin/ios/CameraPopoverOptions.js b/lib/ios/plugin/ios/CameraPopoverOptions.js
deleted file mode 100644
index a74b36b..0000000
--- a/lib/ios/plugin/ios/CameraPopoverOptions.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var Camera = require('cordova/plugin/CameraConstants');
-
-/**
- * Encapsulates options for iOS Popover image picker
- */
-var CameraPopoverOptions = function(x,y,width,height,arrowDir){
-    // information of rectangle that popover should be anchored to
-    this.x = x || 0;
-    this.y = y || 32;
-    this.width = width || 320;
-    this.height = height || 480;
-    // The direction of the popover arrow
-    this.arrowDir = arrowDir || Camera.PopoverArrowDirection.ARROW_ANY;
-};
-
-module.exports = CameraPopoverOptions;
\ No newline at end of file


Mime
View raw message