phonegap-plugin-barcodescanner
Advanced tools
Comparing version 6.0.3 to 6.0.4
# Change Log | ||
[6.0.3](https://github.com/phonegap/phonegap-plugin-barcodescanner/tree/6.0.3) (2016-10-21) | ||
[Full Changelog](https://github.com/phonegap/phonegap-plugin-barcodescanner/compare/6.0.2..6.0.3) | ||
[6.0.4](https://github.com/phonegap/phonegap-plugin-barcodescanner/tree/6.0.4) (2016-12-04) | ||
[Full Changelog](https://github.com/phonegap/phonegap-plugin-barcodescanner/compare/6.0.3..6.0.4) | ||
- Focus improvements [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/52a23b0f42d454d6a9f2e29a693b5e984c0bb13f) | ||
- Crash on iOS on low memory devices [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/6e3718c2db03fda3d8ea439a9471b3a08e121f21) | ||
- Disable Animation [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/f9960f9b81aef35bd85ecba856c63058bc109ac1) | ||
- Flashlight option [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/a7ed6890d4e5e2cb386c8754aca081fad559ba1a) | ||
- Merge pull request #343 from cepm-nate/master [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/77622ca92f5607a8d22131f62f2dea720857a5ed) | ||
- Merge pull request #334 from lucatorella/patch-1 [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/10f94bc81aff5329291272a4922837e04569a339) | ||
- Merge pull request #346 from kunder-lab/master [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/1cdbf871c9d290630e4535e8ed9db0804b413f74) | ||
- Catch Class not registered exception in case of missing Media Player [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/d43964f06c8eb57fc168d7b19027462e957ba23d) | ||
- Adds promise scan .done particularly to handle "No cameras" error [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/68b6fd14a95f34b32ea2bb651f9715ff880e4ade) | ||
- Merge pull request #358 from vladimir-kotikov/explicit_intent [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/75cffc3282f09f6973d078d8ce9b306bff210bd5) | ||
- Use explicit intent to launch scan activity [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/4c046898543dee838b259997a5ec360240e26354) | ||
- Merge pull request #338 from jlowe234/master [view commit](https://github.com/phonegap/phonegap-plugin-barcodescanner/commit/7f4e4daf19951692873a490c845446cfa0fbda68) | ||
@@ -7,0 +18,0 @@ - 6.0.2 [view commit](http://github.com/phonegap/phonegap-plugin-barcodescanner/commit/18f958796ee9587d5bc21e6229f40139dd4f0c8a) |
{ | ||
"name": "phonegap-plugin-barcodescanner", | ||
"version": "6.0.3", | ||
"version": "6.0.4", | ||
"description": "You can use the BarcodeScanner plugin to scan different types of barcodes (using the device's camera) and get the metadata encoded in them for processing within your application.", | ||
@@ -5,0 +5,0 @@ "cordova": { |
@@ -159,2 +159,4 @@ # PhoneGap Plugin BarcodeScanner | ||
"showFlipCameraButton" : true, // iOS and Android | ||
"showTorchButton" : true, // iOS and Android | ||
"disableAnimations" : true, // iOS | ||
"prompt" : "Place a barcode inside the scan area", // supported on Android only | ||
@@ -190,4 +192,7 @@ "formats" : "QR_CODE,PDF_417", // default: all but PDF_417 and RSS_EXPANDED | ||
## Windows quirks ## | ||
Windows implementation currently doesn't support encode functionality. | ||
* Windows implementation currently doesn't support encode functionality. | ||
* On Windows 10 desktop ensure that you have Windows Media Player and Media Feature pack installed. | ||
## Windows Phone 8 quirks ## | ||
@@ -194,0 +199,0 @@ Windows Phone 8 implementation currently doesn't support encode functionality. |
@@ -15,2 +15,3 @@ /* | ||
var OPERATION_IS_IN_PROGRESS = -2147024567; | ||
var REGDB_E_CLASSNOTREG = -2147221164; | ||
var INITIAL_FOCUS_DELAY = 200; // milliseconds | ||
@@ -444,3 +445,14 @@ var CHECK_PLAYING_TIMEOUT = 100; // milliseconds | ||
.then(function (id) { | ||
var captureSettings = new Windows.Media.Capture.MediaCaptureInitializationSettings(); | ||
var captureSettings; | ||
try { | ||
captureSettings = new Windows.Media.Capture.MediaCaptureInitializationSettings(); | ||
} catch (e) { | ||
if (e.number === REGDB_E_CLASSNOTREG) { | ||
throw new Error('Ensure that you have Windows Media Player and Media Feature pack installed.'); | ||
} | ||
throw e; | ||
} | ||
captureSettings.streamingCaptureMode = Windows.Media.Capture.StreamingCaptureMode.video; | ||
@@ -539,7 +551,22 @@ captureSettings.photoCaptureSource = Windows.Media.Capture.PhotoCaptureSource.videoPreview; | ||
capturePreview.pause(); | ||
capturePreview.src = null; | ||
if (capturePreview) { | ||
var isPlaying = !capturePreview.paused && !capturePreview.ended && capturePreview.readyState > 2; | ||
if (isPlaying) { | ||
capturePreview.pause(); | ||
} | ||
// http://stackoverflow.com/a/28060352/4177762 | ||
capturePreview.src = ""; | ||
if (capturePreview.load) { | ||
capturePreview.load(); | ||
} | ||
} | ||
if (capturePreviewFrame) { | ||
document.body.removeChild(capturePreviewFrame); | ||
try { | ||
document.body.removeChild(capturePreviewFrame); | ||
} catch (e) { | ||
// Catching NotFoundError | ||
console.error(e); | ||
} | ||
} | ||
@@ -552,3 +579,8 @@ capturePreviewFrame = null; | ||
if (capture) { | ||
promise = capture.stopRecordAsync(); | ||
try { | ||
promise = capture.stopRecordAsync(); | ||
} catch (e) { | ||
// Catching NotFoundError | ||
console.error(e); | ||
} | ||
} | ||
@@ -577,4 +609,6 @@ capture = null; | ||
BarcodeReader.scanPromise = WinJS.Promise.wrap(createPreview()) | ||
.then(function () { | ||
// Timeout is needed so that the .done finalizer below can be attached to the promise. | ||
BarcodeReader.scanPromise = WinJS.Promise.timeout() | ||
.then(function() { | ||
createPreview(); | ||
checkCancelled(); | ||
@@ -608,3 +642,6 @@ return startPreview(); | ||
}); | ||
}, function (error) { | ||
}); | ||
// Catching any errors here | ||
BarcodeReader.scanPromise.done(function () { }, function (error) { | ||
// Suppress null result (cancel) on suspending | ||
@@ -611,0 +648,0 @@ if (BarcodeReader.suspended) { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
6602417
79
1852
231