kopia lustrzana https://github.com/FacilMap/facilmap
Replace jquery-ui-based colour picker with a bootstrap one
rodzic
d65e182260
commit
ec6924146c
|
@ -4,16 +4,16 @@
|
||||||
return {
|
return {
|
||||||
restrict: 'A',
|
restrict: 'A',
|
||||||
link: function(scope, element, attrs) {
|
link: function(scope, element, attrs) {
|
||||||
$(element).spinner({
|
$(element).TouchSpin({
|
||||||
spin: function(event, ui) {
|
min: 1
|
||||||
setTimeout(function() {
|
}).on('change', function() {
|
||||||
scope.$apply(function() {
|
setTimeout(function() {
|
||||||
scope._spinnerVal = element.val();
|
scope.$apply(function() {
|
||||||
$parse(attrs.ngModel + "=_spinnerVal")(scope);
|
scope._spinnerVal = element.val();
|
||||||
delete scope._spinnerVal;
|
$parse(attrs.ngModel + "=_spinnerVal")(scope);
|
||||||
});
|
delete scope._spinnerVal;
|
||||||
}, 0);
|
});
|
||||||
}
|
}, 0);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
/*! jQuery UI - v1.10.4 - 2014-04-13
|
|
||||||
* http://jqueryui.com
|
|
||||||
* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
|
|
||||||
|
|
||||||
.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}
|
|
File diff suppressed because one or more lines are too long
|
@ -22,7 +22,8 @@
|
||||||
"FileSaver": "https://raw.githubusercontent.com/eligrey/FileSaver.js/master/FileSaver.js",
|
"FileSaver": "https://raw.githubusercontent.com/eligrey/FileSaver.js/master/FileSaver.js",
|
||||||
"blob": "*",
|
"blob": "*",
|
||||||
"angular-bootstrap": "^2.1.4",
|
"angular-bootstrap": "^2.1.4",
|
||||||
"bootstrap": "^3.3.7"
|
"bootstrap": "^3.3.7",
|
||||||
|
"bootstrap-touchspin": "^3.1.2"
|
||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"bootstrap": {
|
"bootstrap": {
|
||||||
|
|
Ładowanie…
Reference in New Issue