mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #455 from colkito/fix/hide-qrcode-scanner-icon
hide qrcode scanner when file://
This commit is contained in:
commit
533cca7b74
|
@ -559,10 +559,10 @@
|
||||||
<div class="small-10 columns">
|
<div class="small-10 columns">
|
||||||
<input type="text" id="address" name="address" placeholder="Send to" ng-model="address" valid-address required>
|
<input type="text" id="address" name="address" placeholder="Send to" ng-model="address" valid-address required>
|
||||||
</div>
|
</div>
|
||||||
<div class="small-2 columns" ng-hide="showScanner">
|
<div class="small-2 columns" ng-hide="showScanner || !isHttp">
|
||||||
<a class="postfix button secondary" ng-click="openScanner()"><i class="fi-camera"></i></a>
|
<a class="postfix button secondary" ng-click="openScanner()"><i class="fi-camera"></i></a>
|
||||||
</div>
|
</div>
|
||||||
<div class="small-2 columns" ng-show="showScanner">
|
<div class="small-2 columns" ng-show="showScanner && isHttp">
|
||||||
<a class="postfix button warning" ng-click="cancelScanner()">Cancel</a>
|
<a class="postfix button warning" ng-click="cancelScanner()">Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -28,10 +28,7 @@ angular.module('copay.send').controller('SendController',
|
||||||
};
|
};
|
||||||
|
|
||||||
// Detect protocol
|
// Detect protocol
|
||||||
$scope.isHttp = function() {
|
$scope.isHttp = ($window.location.protocol.indexOf('http') === 0);
|
||||||
var protocol = $window.location.protocol;
|
|
||||||
return (protocol.indexOf('http') === 0);
|
|
||||||
};
|
|
||||||
|
|
||||||
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
|
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
|
||||||
window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
|
window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
|
||||||
|
|
Loading…
Reference in New Issue