Fixed Conflicts:

bower.json
	js/directives.js
	views/includes/sidebar.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-01 11:12:35 -03:00
commit b94f66f32e
17 changed files with 79 additions and 40 deletions

View file

@ -198,24 +198,31 @@ angular.module('copayApp.directives')
}
};
})
// From https://gist.github.com/asafge/7430497
.directive('ngReallyClick', [
function() {
.directive('openExternal', function() {
return {
restrict: 'A',
link: function(scope, element, attrs) {
element.bind('click', function() {
var message = attrs.ngReallyMessage;
if (message && confirm(message)) {
scope.$apply(attrs.ngReallyClick);
}
window.open('bitcoin:'+attrs.address, '_blank');
});
}
}
}
])
})
// From https://gist.github.com/asafge/7430497
.directive('ngReallyClick', [function() {
return {
restrict: 'A',
link: function(scope, element, attrs) {
element.bind('click', function() {
var message = attrs.ngReallyMessage;
if (message && confirm(message)) {
scope.$apply(attrs.ngReallyClick);
}
});
}
}
}
])
.directive('match', function () {
return {
require: 'ngModel',
@ -265,5 +272,4 @@ angular.module('copayApp.directives')
});
}
};
})
;
});