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

Merge pull request #455 from colkito/fix/hide-qrcode-scanner-icon 

hide qrcode scanner when file://
This commit is contained in:
Gustavo Maximiliano Cortez 2014-05-23 17:43:55 +03:00
parent 41dadab915 49b6e59286
commit 533cca7b74
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -559,10 +559,10 @@
<div class="small-10 columns">
<input type="text" id="address" name="address" placeholder="Send to" ng-model="address" valid-address required>
</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>
</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>
</div>
</div>

5
js/controllers/send.js
View File

@ -28,10 +28,7 @@ angular.module('copay.send').controller('SendController',
};
// Detect protocol
$scope.isHttp = function() {
var protocol = $window.location.protocol;
return (protocol.indexOf('http') === 0);
};
$scope.isHttp = ($window.location.protocol.indexOf('http') === 0);
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;