ripple-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brentlint...@apache.org
Subject [2/3] incubator-ripple git commit: Merge PR: https://github.com/apache/incubator-ripple/pull/34
Date Sun, 16 Nov 2014 19:48:23 GMT
Merge PR: https://github.com/apache/incubator-ripple/pull/34


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

Branch: refs/heads/master
Commit: bd152f6876bbba642c20fca5d63e80430e8f014d
Parents: 520a149 27d7470
Author: Brent Lintner <brent.lintner@gmail.com>
Authored: Sun Nov 16 14:40:24 2014 -0500
Committer: Brent Lintner <brent.lintner@gmail.com>
Committed: Sun Nov 16 14:40:24 2014 -0500

----------------------------------------------------------------------
 assets/client/ripple.css                        | 48 ++++++++++
 .../cordova/3.0.0/bridge/barcodescanner.js      | 95 ++++++++++++++++++++
 lib/client/platform/cordova/3.0.0/spec.js       |  3 +
 .../ui/plugins/barcode-encode/overlay.html      | 27 ++++++
 lib/client/ui/plugins/barcode-scan/dialog.html  | 37 ++++++++
 5 files changed, 210 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/bd152f68/lib/client/platform/cordova/3.0.0/spec.js
----------------------------------------------------------------------
diff --cc lib/client/platform/cordova/3.0.0/spec.js
index 09ec687,4c4553a..b4055a3
--- a/lib/client/platform/cordova/3.0.0/spec.js
+++ b/lib/client/platform/cordova/3.0.0/spec.js
@@@ -57,9 -57,10 +57,12 @@@ module.exports = 
          /** external plugins **/
          // scandit barcode scanner @see https://github.com/Scandit/BarcodeScannerPlugin
          bridge.add("ScanditSDK", ripple('platform/cordova/3.0.0/bridge/scanditsdk'));
+         
+         // RIPPLE-71 BarcodeScaner plugin support @see https://github.com/phonegap-build/BarcodeScanner

+         bridge.add("BarcodeScanner", ripple('platform/cordova/3.0.0/bridge/barcodescanner'));
  
 +        bridge.add("NfcPlugin", ripple('platform/cordova/3.0.0/bridge/nfcdummy'));
 +
          honeypot.monitor(win, "cordova").andRun(get, set);
  
          //HACK: BlackBerry does vibration different


Mime
View raw message