BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updates bower dependencies. Fix angular iOS 9.0.1

This commit is contained in:
Gustavo Maximiliano Cortez 2015-09-27 19:55:59 -03:00
parent dd1898a0bf
commit bd5336ea23
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -58,7 +58,7 @@ module.exports = function(grunt) {
'bower_components/angular-foundation/mm-foundation-tpls.js',
'bower_components/angular-moment/angular-moment.js',
'bower_components/ng-lodash/build/ng-lodash.js',
'bower_components/angular-qrcode/qrcode.js',
'bower_components/angular-qrcode/angular-qrcode.js',
'bower_components/angular-gettext/dist/angular-gettext.js',
'bower_components/angular-touch/angular-touch.js',
'bower_components/angular-bitcore-wallet-client/angular-bitcore-wallet-client.js',

31
bower.json
View File

@ -7,23 +7,20 @@
"bitcore"
],
"dependencies": {
"angular": "~1.3.13",
"angular-foundation": "*",
"angular-qrcode": "~5.1.0",
"angular-gettext": "~2.0.5",
"animate.css": "3.4.0",
"foundation": "zurb/bower-foundation#~5.5.1",
"foundation-icon-fonts": "*",
"ng-lodash": "~0.2.0",
"angular-moment": "0.10.1",
"moment": "2.10.3",
"angular": "1.4.6",
"angular-bitcore-wallet-client": "0.4.4",
"angular-ui-router": "~0.2.13",
"qrcode-decoder-js": "*",
"fastclick": "*",
"angular-ui-switch": "~0.1.0"
},
"resolutions": {
"qrcode-generator": "0.0.1"
"angular-foundation": "0.7.0",
"angular-gettext": "2.1.0",
"angular-moment": "0.10.3",
"angular-qrcode": "monospaced/angular-qrcode#~6.0.3",
"angular-ui-router": "0.2.15",
"angular-ui-switch": "0.1.1",
"animate.css": "3.4.0",
"fastclick": "1.0.6",
"foundation": "5.5.2",
"foundation-icon-fonts": "*",
"moment": "2.10.6",
"ng-lodash": "0.2.3",
"qrcode-decoder-js": "*"
}
}

7
src/js/directives/qrScanner.js
View File

@ -61,7 +61,12 @@ angular.module('copayApp.directives')
};
var _scanStop = function() {
if (localMediaStream && localMediaStream.stop) localMediaStream.stop();
if (localMediaStream && localMediaStream.active) {
var localMediaStreamTrack = localMediaStream.getTracks();
for (var i = 0; i < localMediaStreamTrack.length; i++) {
localMediaStreamTrack[i].stop();
}
}
localMediaStream = null;
video.src = '';
};