summaryrefslogtreecommitdiff
path: root/www/lib/angular-awesome-slider
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-04-10 10:47:35 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-04-10 10:47:35 -0400
commita29f9a676a6ea3bad56ede05cd1a1c82ffbbe8e9 (patch)
tree7e6e6bfb23390a64344fdfe2272a5da04c2dd97c /www/lib/angular-awesome-slider
parent42bc21f7d0b4acfeefa5f4c2708203be78f57778 (diff)
#219 - everything upgraded
Former-commit-id: 15f58d10df83feda8199a1b904433e625ef36b44
Diffstat (limited to 'www/lib/angular-awesome-slider')
-rw-r--r--www/lib/angular-awesome-slider/.bower.json13
-rw-r--r--www/lib/angular-awesome-slider/README.md2
-rw-r--r--www/lib/angular-awesome-slider/bower.json5
-rw-r--r--www/lib/angular-awesome-slider/dist/angular-awesome-slider.js254
-rw-r--r--www/lib/angular-awesome-slider/dist/angular-awesome-slider.min.js83
-rw-r--r--www/lib/angular-awesome-slider/dist/css/angular-awesome-slider.min.css2
-rw-r--r--www/lib/angular-awesome-slider/package.json3
-rw-r--r--www/lib/angular-awesome-slider/src/core/index.js35
-rw-r--r--www/lib/angular-awesome-slider/src/core/model/draggable.factory.js11
-rw-r--r--www/lib/angular-awesome-slider/src/core/model/pointer.factory.js4
-rw-r--r--www/lib/angular-awesome-slider/src/core/model/slider.factory.js201
11 files changed, 377 insertions, 236 deletions
diff --git a/www/lib/angular-awesome-slider/.bower.json b/www/lib/angular-awesome-slider/.bower.json
index ea57b280..9257386f 100644
--- a/www/lib/angular-awesome-slider/.bower.json
+++ b/www/lib/angular-awesome-slider/.bower.json
@@ -1,6 +1,6 @@
{
"name": "angular-awesome-slider",
- "version": "2.4.2",
+ "version": "2.4.4",
"author": {
"name": "Julien Valéry",
"email": "darul75@gmail.com"
@@ -18,7 +18,8 @@
],
"main": [
"./dist/angular-awesome-slider.js",
- "./dist/css/angular-awesome-slider.min.css"
+ "./dist/css/angular-awesome-slider.min.css",
+ "./dist/img/*"
],
"dependencies": {
"angular": "^1.3.x"
@@ -39,13 +40,13 @@
"test",
"tests"
],
- "_release": "2.4.2",
+ "_release": "2.4.4",
"_resolution": {
"type": "version",
- "tag": "2.4.2",
- "commit": "792736e1c5a91616c58f24c5644c98e859451099"
+ "tag": "2.4.4",
+ "commit": "1ceb23fbc755a99a9c625dabacf7b182bbe9f9f5"
},
- "_source": "git://github.com/darul75/angular-awesome-slider.git",
+ "_source": "https://github.com/darul75/angular-awesome-slider.git",
"_target": "~2.4.0",
"_originalSource": "angular-awesome-slider"
} \ No newline at end of file
diff --git a/www/lib/angular-awesome-slider/README.md b/www/lib/angular-awesome-slider/README.md
index a2bc51fb..d31eeb8f 100644
--- a/www/lib/angular-awesome-slider/README.md
+++ b/www/lib/angular-awesome-slider/README.md
@@ -162,6 +162,8 @@ bower install angular-awesome-slider
RELEASE
-------------
+* 2.4.4: move by grabbing the label
+* 2.4.3: fix label + switch from range <=> one value
* 2.4.2: update angular version + fix for programmatic movement of slider (double value)
* 2.4.1: non-minified version added + bower update
* 2.4.0: fix while updating both range values from code
diff --git a/www/lib/angular-awesome-slider/bower.json b/www/lib/angular-awesome-slider/bower.json
index 6e663dff..85d3aaba 100644
--- a/www/lib/angular-awesome-slider/bower.json
+++ b/www/lib/angular-awesome-slider/bower.json
@@ -1,6 +1,6 @@
{
"name": "angular-awesome-slider",
- "version": "2.4.2",
+ "version": "2.4.4",
"author": {
"name": "Julien Valéry",
"email": "darul75@gmail.com"
@@ -18,7 +18,8 @@
],
"main": [
"./dist/angular-awesome-slider.js",
- "./dist/css/angular-awesome-slider.min.css"
+ "./dist/css/angular-awesome-slider.min.css",
+ "./dist/img/*"
],
"dependencies": {
"angular": "^1.3.x"
diff --git a/www/lib/angular-awesome-slider/dist/angular-awesome-slider.js b/www/lib/angular-awesome-slider/dist/angular-awesome-slider.js
index 5436a5f8..49749246 100644
--- a/www/lib/angular-awesome-slider/dist/angular-awesome-slider.js
+++ b/www/lib/angular-awesome-slider/dist/angular-awesome-slider.js
@@ -43,13 +43,13 @@
var initialized = false;
- var init = function() {
+ var init = function(value) {
scope.from = ''+scope.options.from;
scope.to = ''+scope.options.to;
- if (scope.options.calculate && typeof scope.options.calculate === 'function') {
+ if (scope.options.calculate && angular.isFunction(scope.options.calculate)) {
scope.from = scope.options.calculate(scope.from);
scope.to = scope.options.calculate(scope.to);
- }
+ }
var OPTIONS = {
from: !scope.options.round ? parseInt(scope.options.from, 10) : parseFloat(scope.options.from),
@@ -58,8 +58,8 @@
smooth: scope.options.smooth,
limits: scope.options.limits,
round: scope.options.round || false,
- value: ngModel.$viewValue,
- dimension: "",
+ value: value || ngModel.$viewValue,
+ dimension: '',
scale: scope.options.scale,
modelLabels: scope.options.modelLabels,
vertical: scope.options.vertical,
@@ -88,7 +88,7 @@
if (scope.ngDisabled) {
disabler(scope.ngDisabled);
- }
+ }
initialized = true;
};
@@ -113,9 +113,12 @@
ngModel.$viewValue = ''+ngModel.$viewValue;
}
- if( !ngModel.$viewValue.split(";")[1]) {
+ if( !ngModel.$viewValue.split(';')[1]) {
scope.mainSliderClass += ' jslider-single';
}
+ else {
+ scope.mainSliderClass = scope.mainSliderClass.replace(' jslider-single', '');
+ }
if (scope.slider) {
var vals = ngModel.$viewValue.split(";");
@@ -123,14 +126,22 @@
if (vals[1]) {
scope.slider.getPointers()[1].set(vals[1], true);
//if moving left to right with two pointers
- //we need to "finish" moving the first
+ //we need to "finish" moving the first
if(parseInt(vals[1]) > parseInt(vals[0])){
scope.slider.getPointers()[0].set(vals[0], true);
}
- }
+ }
}
+
};
+ scope.$on('slider-value-update', function(e, msg){
+ init(msg.value);
+ timeout(function(){
+ scope.slider.redrawPointers();
+ });
+ });
+
// view -> model
var forceApply = function(value, released) {
if (scope.disabled)
@@ -161,14 +172,14 @@
scope.$watch('ngDisabled', function(value) {
disabler(value);
- });
+ });
scope.limitValue = function(value) {
if (scope.options.modelLabels) {
if (angular.isFunction(scope.options.modelLabels)) {
return scope.options.modelLabels(value);
- }
- return scope.options.modelLabels[value] !== undefined ? scope.options.modelLabels[value] : value;
+ }
+ return scope.options.modelLabels[value] !== undefined ? scope.options.modelLabels[value] : value;
}
return value;
};
@@ -282,6 +293,7 @@
Draggable.prototype._init = function() {
if( arguments.length > 0 ){
this.ptr = arguments[0];
+ this.label = arguments[3];
this.parent = arguments[2];
if (!this.ptr)
@@ -356,6 +368,14 @@
self._mouseup(event);
});
+ this._bindEvent( this.label, 'down', function(event) {
+ self._mousedown( event );
+ return false;
+ });
+ this._bindEvent( this.label, 'up', function(event) {
+ self._mouseup( event );
+ });
+
this._bindEvent( this.ptr, 'down', function(event) {
self._mousedown( event );
return false;
@@ -429,7 +449,8 @@
return Draggable;
}]);
-}(angular));;(function(angular){
+}(angular));
+;(function(angular){
'use strict';
angular.module('angularAwesomeSlider').factory('sliderPointer', ['sliderDraggable', 'sliderUtils', function(Draggable, utils) {
@@ -440,7 +461,7 @@
SliderPointer.prototype = new Draggable();
- SliderPointer.prototype.oninit = function( ptr, id, vertical, _constructor ) {
+ SliderPointer.prototype.oninit = function( ptr, id, vertical, label, _constructor ) {
this.uid = id;
this.parent = _constructor;
this.value = {};
@@ -528,7 +549,8 @@
return SliderPointer;
}]);
-}(angular));;(function(angular){
+}(angular));
+;(function(angular){
'use strict';
angular.module('angularAwesomeSlider').factory('slider', ['sliderPointer', 'sliderConstants', 'sliderUtils', function(SliderPointer, sliderConstants, utils) {
@@ -537,18 +559,20 @@
return this.init.apply(this, arguments);
}
- Slider.prototype.init = function( inputNode, templateNode, settings ){
- this.settings = settings;
+ Slider.prototype.init = function( inputNode, templateNode, settings ){
+ this.settings = settings;
this.inputNode = inputNode;
- this.inputNode.addClass("ng-hide");
+ this.inputNode.addClass('ng-hide');
this.settings.interval = this.settings.to-this.settings.from;
-
- if(this.settings.calculate && angular.isFunction(this.settings.calculate))
- this.nice = this.settings.calculate;
- if(this.settings.onstatechange && angular.isFunction(this.settings.onstatechange))
+ if(this.settings.calculate && angular.isFunction(this.settings.calculate)) {
+ this.nice = this.settings.calculate;
+ }
+
+ if(this.settings.onstatechange && angular.isFunction(this.settings.onstatechange)) {
this.onstatechange = this.settings.onstatechange;
+ }
this.css = sliderConstants.SLIDER.css;
this.is = {init: false};
@@ -557,7 +581,7 @@
this.isAsc = settings.from < settings.to;
this.create(templateNode);
-
+
return this;
};
@@ -586,20 +610,21 @@
indicator2 = angElt(is[4]),
indicator3 = angElt(is[5]),
indicator4 = angElt(is[6]),
- pointers = [pointer1, pointer2],
+ labels = [pointerLabel1, pointerLabel2],
+ pointers = [pointer1, pointer2],
off = utils.offset(this.domNode),
offset = {
left: off.left,
top: off.top,
width: this.domNode[0].clientWidth,
height: this.domNode[0].clientHeight
- },
+ },
values = self.settings.value.split(';');
- this.sizes = {
+ this.sizes = {
domWidth: this.domNode[0].clientWidth,
domHeight: this.domNode[0].clientHeight,
- domOffset: offset
+ domOffset: offset
};
// find some objects
@@ -617,12 +642,14 @@
angExt(this.o.labels[1], {
value: this.o.labels[1].o.find("span")
});
-
+
// single pointer
- this.settings.single = !self.settings.value.split(";")[1];
+ this.settings.single = !self.settings.value.split(";")[1];
if (this.settings.single) {
range.addClass('ng-hide');
+ } else {
+ range.removeClass('ng-hide');
}
angForEach(pointers, function(pointer, key) {
@@ -636,7 +663,7 @@
offset;
if(value) {
- self.o.pointers[key] = new SliderPointer(pointer, key, self.settings.vertical, self);
+ self.o.pointers[key] = new SliderPointer(pointer, key, self.settings.vertical, labels[key], self);
prev = values[key-1];
prevValue = prev ? parseInt(prev, 10 ) : undefined;
@@ -651,51 +678,48 @@
/* test = self.isAsc ? value < self.settings.from : value > self.settings.from,
value1 = test ? self.settings.from : value; */
- test = self.isAsc ? value > self.settings.to : value < self.settings.to;
+ test = self.isAsc ? value > self.settings.to : value < self.settings.to;
value1 = test ? self.settings.to : value;
self.o.pointers[key].set( value1, true );
-
+
// reinit position d
offset = utils.offset(self.o.pointers[key].ptr);
self.o.pointers[key].d = {
left: offset.left,
top: offset.top
- };
- }
+ };
+ }
});
self.domNode.bind('mousedown', self.clickHandler.apply(self));
- this.o.value = angElt(this.domNode.find("i")[2]);
+ this.o.value = angElt(this.domNode.find("i")[2]);
this.is.init = true;
// CSS SKIN
- if (this.settings.css) {
+ if (this.settings.css) {
indicatorLeft.css(this.settings.css.background ? this.settings.css.background : {});
indicatorRight.css(this.settings.css.background ? this.settings.css.background : {});
if (!this.o.pointers[1]) {
- indicator1.css(this.settings.css.before ? this.settings.css.before : {});
+ indicator1.css(this.settings.css.before ? this.settings.css.before : {});
indicator4.css(this.settings.css.after ? this.settings.css.after : {});
}
- indicator2.css(this.settings.css.default ? this.settings.css.default : {});
+ indicator2.css(this.settings.css.default ? this.settings.css.default : {});
indicator3.css(this.settings.css.default ? this.settings.css.default : {});
-
+
range.css(this.settings.css.range ? this.settings.css.range : {});
pointer1.css(this.settings.css.pointer ? this.settings.css.pointer : {});
pointer2.css(this.settings.css.pointer ? this.settings.css.pointer : {});
- }
-
- angForEach(this.o.pointers, function(pointer, key){
- self.redraw(pointer);
- });
-
+ }
+
+ this.redrawPointers();
};
Slider.prototype.clickHandler = function() {
- var self = this;
+ var self = this;
// in case of showing/hiding
var resetPtrSize = function( ptr ) {
@@ -721,51 +745,51 @@
return function(evt) {
if (self.disabled)
- return;
+ return;
var vertical = self.settings.vertical,
targetIdx = 0,
_off = utils.offset(self.domNode),
firstPtr = self.o.pointers[0],
secondPtr = self.o.pointers[1] ? self.o.pointers[1] : null,
- tmpPtr,
+ tmpPtr,
evtPosition = evt.originalEvent ? evt.originalEvent: evt,
- mouse = vertical ? evtPosition.pageY : evtPosition.pageX,
+ mouse = vertical ? evtPosition.pageY : evtPosition.pageX,
css = vertical ? 'top' : 'left',
offset = { left: _off.left, top: _off.top, width: self.domNode[0].clientWidth, height: self.domNode[0].clientHeight },
targetPtr = self.o.pointers[targetIdx];
-
+
if (secondPtr) {
if (!secondPtr.d.width) {
resetPtrSize();
- }
+ }
var firstPtrPosition = utils.offset(firstPtr.ptr)[css];
var secondPtrPosition = utils.offset(secondPtr.ptr)[css];
- var middleGap = Math.abs((secondPtrPosition - firstPtrPosition) / 2);
+ var middleGap = Math.abs((secondPtrPosition - firstPtrPosition) / 2);
var testSecondPtrToMove = mouse >= secondPtrPosition || mouse >= (secondPtrPosition - middleGap);
if (testSecondPtrToMove) {
targetPtr = secondPtr;
}
}
targetPtr._parent = {offset: offset, width: offset.width, height: offset.height};
- var coords = firstPtr._getPageCoords( evt );
+ var coords = firstPtr._getPageCoords( evt );
targetPtr.cx = coords.x - targetPtr.d.left;
- targetPtr.cy = coords.y - targetPtr.d.top;
+ targetPtr.cy = coords.y - targetPtr.d.top;
targetPtr.onmousemove( evt, coords.x, coords.y);
- targetPtr.onmouseup();
+ targetPtr.onmouseup();
angular.extend(targetPtr.d, {
left: coords.x,
- top: coords.y
- });
-
+ top: coords.y
+ });
+
self.redraw(targetPtr);
return false;
};
};
- Slider.prototype.disable = function( bool ) {
+ Slider.prototype.disable = function( bool ) {
this.disabled = bool;
- };
+ };
Slider.prototype.nice = function( value ){
return value;
@@ -790,7 +814,7 @@
if(x > 100) x = 100;
return Math.round(x*10) / 10;
- };
+ };
Slider.prototype.getPointers = function(){
return this.o.pointers;
@@ -808,12 +832,12 @@
position = this.settings.vertical ? 'top' : 'left',
i=0;
for(; i < s.length; i++) {
- if (!s[i].val) {
+ if (!angular.isDefined(s[i].val)) {
prc = (100/(s.length-1)).toFixed(2);
str += '<span style="'+ position + ': ' + i*prc + '%">' + ( s[i] != '|' ? '<ins>' + s[i] + '</ins>' : '' ) + '</span>';
}
- if (s[i].val <= this.settings.to && s[i].val >= this.settings.from && ! duplicate[s[i].val]) {
+ if (s[i].val <= this.settings.to && s[i].val >= this.settings.from && ! duplicate[s[i].val]) {
duplicate[s[i].val] = true;
prc = this.valueToPrc(s[i].val);
label = s[i].label ? s[i].label : s[i].val;
@@ -840,23 +864,28 @@
}
};
- angular.forEach(this.o.pointers, function(ptr, key) {
- self.redraw(ptr);
- });
+ this.redrawPointers();
};
Slider.prototype.update = function(){
this.onresize();
this.drawScale();
- };
+ };
Slider.prototype.drawScale = function( scaleDiv ){
angular.forEach(angular.element(scaleDiv).find('ins'), function(scaleLabel, key) {
scaleLabel.style.marginLeft = - scaleLabel.clientWidth / 2;
});
- };
+ };
+
+ Slider.prototype.redrawPointers = function() {
- Slider.prototype.redraw = function( pointer ){
+ angular.forEach(this.o.pointers, function(pointer){
+ this.redraw(pointer);
+ }, this);
+ };
+
+ Slider.prototype.redraw = function( pointer ){
if(!this.is.init) {
// this.settings.single
if(this.o.pointers[0] && !this.o.pointers[1]) {
@@ -878,13 +907,13 @@
var newPos,
newWidth;
- // redraw range line
+ // redraw range line
if(this.o.pointers[0] && this.o.pointers[1]) {
- newPos = !this.settings.vertical ?
+ newPos = !this.settings.vertical ?
{ left: this.o.pointers[0].value.prc + "%", width: ( this.o.pointers[1].value.prc - this.o.pointers[0].value.prc ) + "%" }
:
{ top: this.o.pointers[0].value.prc + "%", height: ( this.o.pointers[1].value.prc - this.o.pointers[0].value.prc ) + "%" };
-
+
this.o.value.css(newPos);
// both pointer overlap on limits
@@ -893,7 +922,7 @@
}
}
-
+
if(this.o.pointers[0] && !this.o.pointers[1]) {
newWidth = this.o.pointers[0].value.prc - this.originValue;
if (newWidth >= 0) {
@@ -908,9 +937,9 @@
}
else {
this.o.indicators[0].css(!this.settings.vertical ? {width: this.originValue + "%"} : {height: this.originValue + "%"});
- }
+ }
- }
+ }
var value = this.nice(pointer.value.origin);
if (this.settings.modelLabels) {
@@ -921,8 +950,8 @@
value = this.settings.modelLabels[value] !== undefined ? this.settings.modelLabels[value] : value;
}
}
-
- this.o.labels[pointer.uid].value.html(value);
+
+ this.o.labels[pointer.uid].value.html(value);
// redraw position of labels
this.redrawLabels( pointer );
@@ -945,10 +974,10 @@
sizes.margin = 0;
sizes.right = true;
} else
- sizes.right = false;
- }
+ sizes.right = false;
+ }
- if (!self.settings.vertical)
+ if (!self.settings.vertical)
label.o.css({ left: prc + "%", marginLeft: sizes.margin+"px", right: "auto" });
else
label.o.css({ top: prc + "%", marginLeft: "20px", marginTop: sizes.margin, bottom: "auto" });
@@ -966,9 +995,9 @@
prc = pointer.value.prc,
// case hidden
labelWidthSize = label.o[0].offsetWidth === 0 ? (label.o[0].textContent.length)*7 : label.o[0].offsetWidth;
-
+
this.sizes.domWidth = this.domNode[0].clientWidth;
- this.sizes.domHeight = this.domNode[0].clientHeight;
+ this.sizes.domHeight = this.domNode[0].clientHeight;
var sizes = {
label: !self.settings.vertical ? labelWidthSize : label.o[0].offsetHeight,
@@ -978,12 +1007,12 @@
var anotherIdx = pointer.uid === 0 ? 1:0,
anotherLabel,
- anotherPtr;
+ anotherPtr;
if (!this.settings.single && !this.settings.vertical){
- // glue if near;
+ // glue if near;
anotherLabel = this.o.labels[anotherIdx];
- anotherPtr = this.o.pointers[anotherIdx];
+ anotherPtr = this.o.pointers[anotherIdx];
var label1 = this.o.labels[0],
label2 = this.o.labels[1],
ptr1 = this.o.pointers[0],
@@ -995,27 +1024,27 @@
label2.o.css(this.css.visible);
value = this.getLabelValue(value);
-
+
if (gapBetweenLabel + 10 < label1.o[0].offsetWidth+label2.o[0].offsetWidth) {
anotherLabel.o.css(this.css.hidden);
-
+
anotherLabel.value.html(value);
prc = (anotherPtr.value.prc - prc) / 2 + prc;
if(anotherPtr.value.prc != pointer.value.prc){
value = this.nice(this.o.pointers[0].value.origin);
var value1 = this.nice(this.o.pointers[1].value.origin);
value = this.getLabelValue(value);
- value1 = this.getLabelValue(value1);
-
+ value1 = this.getLabelValue(value1);
+
label.value.html(value + "&nbsp;&ndash;&nbsp;" + value1);
sizes.label = label.o[0].offsetWidth;
sizes.border = (prc * domSize) / 100;
}
}
- else {
+ else {
anotherLabel.value.html(value);
anotherLabel.o.css(this.css.visible);
- }
+ }
}
sizes = setPosition(label, sizes, prc);
@@ -1033,9 +1062,9 @@
};
sizes = setPosition(anotherLabel, sizes2, anotherPtr.value.prc);
}
-
+
this.redrawLimits();
- };
+ };
Slider.prototype.redrawLimits = function() {
if (this.settings.limits) {
@@ -1058,19 +1087,19 @@
limit = this.o.limits[1];
if(label_left + label.o[0].clientWidth > this.sizes.domWidth - limit[0].clientWidth){
- limits[1] = false;
+ limits[1] = false;
}
-
+
}
}
for(; i < limits.length; i++){
if(limits[i]){ // TODO animate
- angular.element(this.o.limits[i]).addClass("animate-show");
+ angular.element(this.o.limits[i]).addClass("animate-show");
}
else{
angular.element(this.o.limits[i]).addClass("animate-hidde");
- }
+ }
}
}
};
@@ -1087,7 +1116,7 @@
var value = "";
angular.forEach(this.o.pointers, function(pointer, key){
- if(pointer.value.prc !== undefined && !isNaN(pointer.value.prc))
+ if(pointer.value.prc !== undefined && !isNaN(pointer.value.prc))
value += (key > 0 ? ";" : "") + $this.prcToValue(pointer.value.prc);
});
return value;
@@ -1095,14 +1124,14 @@
Slider.prototype.getLabelValue = function(value){
if (this.settings.modelLabels) {
- if (angular.isFunction(this.settings.modelLabels)) {
+ if (angular.isFunction(this.settings.modelLabels)) {
return this.settings.modelLabels(value);
}
else {
return this.settings.modelLabels[value] !== undefined ? this.settings.modelLabels[value] : value;
}
- }
-
+ }
+
return value;
};
@@ -1120,7 +1149,7 @@
Slider.prototype.prcToValue = function( prc ){
var value;
- if (this.settings.heterogeneity && this.settings.heterogeneity.length > 0){
+ if (this.settings.heterogeneity && this.settings.heterogeneity.length > 0){
var h = this.settings.heterogeneity,
_start = 0,
_from = this.settings.round ? parseFloat(this.settings.from) : parseInt(this.settings.from, 10),
@@ -1129,7 +1158,7 @@
for (; i <= h.length; i++){
var v;
- if(h[i])
+ if(h[i])
v = h[i].split('/');
else
v = [100, _to];
@@ -1144,10 +1173,10 @@
_start = v1;
_from = v2;
}
- }
+ }
else {
value = this.settings.from + (prc * this.settings.interval) / 100;
- }
+ }
return this.round(value);
};
@@ -1155,10 +1184,10 @@
Slider.prototype.valueToPrc = function( value, pointer ){
var prc,
_from = this.settings.round ? parseFloat(this.settings.from) : parseInt(this.settings.from, 10);
-
+
if (this.settings.heterogeneity && this.settings.heterogeneity.length > 0){
var h = this.settings.heterogeneity,
- _start = 0,
+ _start = 0,
i = 0;
for (; i <= h.length; i++) {
@@ -1166,7 +1195,7 @@
if(h[i])
v = h[i].split('/');
else
- v = [100, this.settings.to];
+ v = [100, this.settings.to];
var v1 = this.settings.round ? parseFloat(v[0]) : parseInt(v[0], 10);
var v2 = this.settings.round ? parseFloat(v[1]) : parseInt(v[1], 10);
@@ -1196,17 +1225,18 @@
Slider.prototype.round = function( value ){
value = Math.round(value / this.settings.step) * this.settings.step;
- if(this.settings.round)
+ if(this.settings.round)
value = Math.round(value * Math.pow(10, this.settings.round)) / Math.pow(10, this.settings.round);
- else
+ else
value = Math.round(value);
- return value;
+ return value;
};
return Slider;
}]);
-}(angular));;(function(angular, undefined) {
+}(angular));
+;(function(angular, undefined) {
'use strict';
angular.module('angularAwesomeSlider')
diff --git a/www/lib/angular-awesome-slider/dist/angular-awesome-slider.min.js b/www/lib/angular-awesome-slider/dist/angular-awesome-slider.min.js
index 0dfe8b84..81bd82d9 100644
--- a/www/lib/angular-awesome-slider/dist/angular-awesome-slider.min.js
+++ b/www/lib/angular-awesome-slider/dist/angular-awesome-slider.min.js
@@ -1,6 +1,85 @@
/**
-* @license angular-awesome-slider - v2.4.2
+* @license angular-awesome-slider - v2.4.4
* (c) 2013 Julien VALERY https://github.com/darul75/angular-awesome-slider
* License: MIT
**/
-!function(a){"use strict";a.module("angularAwesomeSlider",[]).directive("slider",["$compile","$templateCache","$timeout","$window","slider",function(b,c,d,e,f){return{restrict:"AE",require:"?ngModel",scope:{options:"=",ngDisabled:"="},priority:1,link:function(g,h,i,j){function k(){a.element(e).bind("resize",function(a){g.slider.onresize()})}if(j){if(!g.options)throw new Error('You must provide a value for "options" attribute.');a.injector();a.isString(g.options)&&(g.options=a.toJson(g.options)),g.mainSliderClass="jslider",g.mainSliderClass+=g.options.skin?" jslider_"+g.options.skin:" ",g.mainSliderClass+=g.options.vertical?" vertical ":"",g.mainSliderClass+=g.options.css?" sliderCSS":"",g.mainSliderClass+=g.options.className?" "+g.options.className:"",g.options.limits=a.isDefined(g.options.limits)?g.options.limits:!0,h.after(b(c.get("ng-slider/slider-bar.tmpl.html"))(g,function(a,b){b.tmplElt=a}));var l=!1,m=function(){g.from=""+g.options.from,g.to=""+g.options.to,g.options.calculate&&"function"==typeof g.options.calculate&&(g.from=g.options.calculate(g.from),g.to=g.options.calculate(g.to));var b={from:g.options.round?parseFloat(g.options.from):parseInt(g.options.from,10),to:g.options.round?parseFloat(g.options.to):parseInt(g.options.to,10),step:g.options.step,smooth:g.options.smooth,limits:g.options.limits,round:g.options.round||!1,value:j.$viewValue,dimension:"",scale:g.options.scale,modelLabels:g.options.modelLabels,vertical:g.options.vertical,css:g.options.css,className:g.options.className,realtime:g.options.realtime,cb:n,threshold:g.options.threshold,heterogeneity:g.options.heterogeneity};b.calculate=g.options.calculate||void 0,b.onstatechange=g.options.onstatechange||void 0,g.slider=g.slider?g.slider.init(h,g.tmplElt,b):p(h,g.tmplElt,b),l||k();var c=g.tmplElt.find("div")[7];a.element(c).html(g.slider.generateScale()),g.slider.drawScale(c),g.ngDisabled&&o(g.ngDisabled),l=!0};j.$render=function(){if((j.$viewValue||0===j.$viewValue)&&("number"==typeof j.$viewValue&&(j.$viewValue=""+j.$viewValue),j.$viewValue.split(";")[1]||(g.mainSliderClass+=" jslider-single"),g.slider)){var a=j.$viewValue.split(";");g.slider.getPointers()[0].set(a[0],!0),a[1]&&(g.slider.getPointers()[1].set(a[1],!0),parseInt(a[1])>parseInt(a[0])&&g.slider.getPointers()[0].set(a[0],!0))}};var n=function(a,b){g.disabled||(g.$apply(function(){j.$setViewValue(a)}),g.options.callback&&g.options.callback(a,b))};g.$watch("options",function(a){d(function(){m()})},g.watchOptions||!0);var o=function(a){g.disabled=a,g.slider&&(g.tmplElt.toggleClass("disabled"),g.slider.disable(a))};g.$watch("ngDisabled",function(a){o(a)}),g.limitValue=function(b){return g.options.modelLabels?a.isFunction(g.options.modelLabels)?g.options.modelLabels(b):void 0!==g.options.modelLabels[b]?g.options.modelLabels[b]:b:b};var p=function(a,b,c){return new f(a,b,c)}}}}}]).config(function(){}).run(function(){})}(angular),function(a){"use strict";a.module("angularAwesomeSlider").constant("sliderConstants",{SLIDER:{settings:{from:1,to:40,step:1,smooth:!0,limits:!1,round:!1,value:"3",dimension:"",vertical:!1,calculate:!1,onstatechange:!1,callback:!1,realtime:!1},className:"jslider",selector:".jslider-",css:{visible:{visibility:"visible"},hidden:{visibility:"hidden"}}},EVENTS:{}})}(angular),function(a){"use strict";a.module("angularAwesomeSlider").factory("sliderUtils",["$window",function(a){return{offset:function(a){var b=a[0],c=0,d=0,e=document.documentElement||document.body,f=window.pageXOffset||e.scrollLeft,g=window.pageYOffset||e.scrollTop;return c=b.getBoundingClientRect().left+f,d=b.getBoundingClientRect().top+g,{left:c,top:d}},browser:function(){var b=a.navigator.userAgent,c={mozilla:/mozilla/i,chrome:/chrome/i,safari:/safari/i,firefox:/firefox/i,ie:/internet explorer/i};for(var d in c)if(c[d].test(b))return d;return"unknown"}}}])}(angular),function(a){"use strict";a.module("angularAwesomeSlider").factory("sliderDraggable",["sliderUtils",function(b){function c(){this._init.apply(this,arguments)}return c.prototype.oninit=function(){},c.prototype.events=function(){},c.prototype.onmousedown=function(){this.ptr.css({position:"absolute"})},c.prototype.onmousemove=function(a,b,c){this.ptr.css({left:b,top:c})},c.prototype.onmouseup=function(){},c.prototype.isDefault={drag:!1,clicked:!1,toclick:!0,mouseup:!1},c.prototype._init=function(){if(arguments.length>0){if(this.ptr=arguments[0],this.parent=arguments[2],!this.ptr)return;this.is={},a.extend(this.is,this.isDefault);var c=b.offset(this.ptr);this.d={left:c.left,top:c.top,width:this.ptr[0].clientWidth,height:this.ptr[0].clientHeight},this.oninit.apply(this,arguments),this._events()}},c.prototype._getPageCoords=function(a){return a.targetTouches&&a.targetTouches[0]?{x:a.targetTouches[0].pageX,y:a.targetTouches[0].pageY}:{x:a.pageX,y:a.pageY}},c.prototype._bindEvent=function(a,b,c){this.supportTouches_&&a[0].addEventListener(this.events_[b].touch,c,!1),a.bind(this.events_[b].nonTouch,c)},c.prototype._events=function(){var b=this;this.supportTouches_="ontouchend"in document,this.events_={click:{touch:"touchstart",nonTouch:"click"},down:{touch:"touchstart",nonTouch:"mousedown"},move:{touch:"touchmove",nonTouch:"mousemove"},up:{touch:"touchend",nonTouch:"mouseup"},mousedown:{touch:"mousedown",nonTouch:"mousedown"}};var c=a.element(window.document);this._bindEvent(c,"move",function(a){b.is.drag&&(a.stopPropagation(),a.preventDefault(),b.parent.disabled||b._mousemove(a))}),this._bindEvent(c,"down",function(a){b.is.drag&&(a.stopPropagation(),a.preventDefault())}),this._bindEvent(c,"up",function(a){b._mouseup(a)}),this._bindEvent(this.ptr,"down",function(a){return b._mousedown(a),!1}),this._bindEvent(this.ptr,"up",function(a){b._mouseup(a)}),this.events()},c.prototype._mousedown=function(b){this.is.drag=!0,this.is.clicked=!1,this.is.mouseup=!1;var c=this._getPageCoords(b);this.cx=c.x-this.ptr[0].offsetLeft,this.cy=c.y-this.ptr[0].offsetTop,a.extend(this.d,{left:c.x,top:c.y,width:this.ptr[0].clientWidth,height:this.ptr[0].clientHeight}),this.outer&&this.outer.get(0)&&this.outer.css({height:Math.max(this.outer.height(),$(document.body).height()),overflow:"hidden"}),this.onmousedown(b)},c.prototype._mousemove=function(a){this.is.toclick=!1;var b=this._getPageCoords(a);this.onmousemove(a,b.x-this.cx,b.y-this.cy)},c.prototype._mouseup=function(a){if(this.is.drag){this.is.drag=!1;var c=b.browser();this.outer&&this.outer.get(0)&&("mozilla"===c?this.outer.css({overflow:"hidden"}):this.outer.css({overflow:"visible"}),this.outer.css({height:"auto"})),this.onmouseup(a)}},c}])}(angular),function(a){"use strict";a.module("angularAwesomeSlider").factory("sliderPointer",["sliderDraggable","sliderUtils",function(b,c){function d(){b.apply(this,arguments)}return d.prototype=new b,d.prototype.oninit=function(b,c,d,e){this.uid=c,this.parent=e,this.value={},this.vertical=d,this.settings=a.copy(e.settings),this.threshold=this.settings.threshold},d.prototype.onmousedown=function(a){var b=c.offset(this.parent.domNode),d={left:b.left,top:b.top,width:this.parent.domNode[0].clientWidth,height:this.parent.domNode[0].clientHeight};this._parent={offset:d,width:d.width,height:d.height},this.ptr.addClass("jslider-pointer-hover")},d.prototype.onmousemove=function(b,c,d){var e=this._getPageCoords(b);this._set(this.vertical?this.calc(e.y):this.calc(e.x)),this.settings.realtime&&this.settings.cb&&a.isFunction(this.settings.cb)&&this.settings.cb.call(this.parent,this.parent.getValue(),!this.is.drag)},d.prototype.onmouseup=function(b){this.settings.cb&&a.isFunction(this.settings.cb)&&this.settings.cb.call(this.parent,this.parent.getValue(),!this.is.drag),this.is.drag||this.ptr.removeClass("jslider-pointer-hover")},d.prototype.limits=function(a){return this.parent.limits(a,this)},d.prototype.calc=function(a){return this.vertical?this.limits(100*(a-this._parent.offset.top)/this._parent.height):this.limits(100*(a-this._parent.offset.left)/this._parent.width)},d.prototype.set=function(a,b){this.value.origin=this.parent.round(a),this._set(this.parent.valueToPrc(a,this),b)},d.prototype._set=function(a,b){this.allowed=!0;var c=this.value.origin,d=this.value.prc;if(this.value.origin=this.parent.prcToValue(a),this.value.prc=a,this.threshold&&this.parent.o.pointers[1]){var e=this.value.origin,f=this.parent.o.pointers[0===this.uid?1:0].value.origin;this.allowed=Math.abs(f-e)>=this.threshold,this.allowed||void 0===c||void 0===d||(this.value.origin=c,this.value.prc=d)}this.vertical?this.ptr.css({top:this.value.prc+"%",marginTop:-5}):this.ptr.css({left:this.value.prc+"%"}),this.parent.redraw(this)},d}])}(angular),function(a){"use strict";a.module("angularAwesomeSlider").factory("slider",["sliderPointer","sliderConstants","sliderUtils",function(b,c,d){function e(){return this.init.apply(this,arguments)}return e.prototype.init=function(b,d,e){return this.settings=e,this.inputNode=b,this.inputNode.addClass("ng-hide"),this.settings.interval=this.settings.to-this.settings.from,this.settings.calculate&&a.isFunction(this.settings.calculate)&&(this.nice=this.settings.calculate),this.settings.onstatechange&&a.isFunction(this.settings.onstatechange)&&(this.onstatechange=this.settings.onstatechange),this.css=c.SLIDER.css,this.is={init:!1},this.o={},this.initValue={},this.isAsc=e.from<e.to,this.create(d),this},e.prototype.create=function(c){var e=this;this.domNode=c;var f=this.domNode.find("div"),g=this.domNode.find("i"),h=a.element,i=a.extend,j=a.forEach,k=h(f[1]),l=h(f[2]),m=h(f[5]),n=h(f[6]),o=h(g[0]),p=h(g[1]),q=h(g[2]),r=h(g[3]),s=h(g[4]),t=h(g[5]),u=h(g[6]),v=[k,l],w=d.offset(this.domNode),x={left:w.left,top:w.top,width:this.domNode[0].clientWidth,height:this.domNode[0].clientHeight},y=e.settings.value.split(";");this.sizes={domWidth:this.domNode[0].clientWidth,domHeight:this.domNode[0].clientHeight,domOffset:x},i(this.o,{pointers:{},labels:{0:{o:m},1:{o:n}},limits:{0:a.element(f[3]),1:a.element(f[4])},indicators:{0:r,1:s,2:t,3:u}}),i(this.o.labels[0],{value:this.o.labels[0].o.find("span")}),i(this.o.labels[1],{value:this.o.labels[1].o.find("span")}),this.settings.single=!e.settings.value.split(";")[1],this.settings.single&&q.addClass("ng-hide"),j(v,function(c,f){e.settings=a.copy(e.settings);var g,h,i,j,k,l=y[f];l&&(e.o.pointers[f]=new b(c,f,e.settings.vertical,e),g=y[f-1],h=g?parseInt(g,10):void 0,l=e.settings.round?parseFloat(l):parseInt(l,10),(g&&e.isAsc?h>l:l>h)&&(l=g),i=e.isAsc?l>e.settings.to:l<e.settings.to,j=i?e.settings.to:l,e.o.pointers[f].set(j,!0),k=d.offset(e.o.pointers[f].ptr),e.o.pointers[f].d={left:k.left,top:k.top})}),e.domNode.bind("mousedown",e.clickHandler.apply(e)),this.o.value=h(this.domNode.find("i")[2]),this.is.init=!0,this.settings.css&&(o.css(this.settings.css.background?this.settings.css.background:{}),p.css(this.settings.css.background?this.settings.css.background:{}),this.o.pointers[1]||(r.css(this.settings.css.before?this.settings.css.before:{}),u.css(this.settings.css.after?this.settings.css.after:{})),s.css(this.settings.css["default"]?this.settings.css["default"]:{}),t.css(this.settings.css["default"]?this.settings.css["default"]:{}),q.css(this.settings.css.range?this.settings.css.range:{}),k.css(this.settings.css.pointer?this.settings.css.pointer:{}),l.css(this.settings.css.pointer?this.settings.css.pointer:{})),j(this.o.pointers,function(a,b){e.redraw(a)})},e.prototype.clickHandler=function(){var b=this,c=function(a){var c=b.o.pointers[0].ptr,e=b.o.pointers[1].ptr,f=d.offset(c),g=d.offset(e);b.o.pointers[0].d={left:f.left,top:f.top,width:c[0].clientWidth,height:c[0].clientHeight},b.o.pointers[1].d={left:g.left,top:g.top,width:e[0].clientWidth,height:e[0].clientHeight}};return function(e){if(!b.disabled){var f=b.settings.vertical,g=0,h=d.offset(b.domNode),i=b.o.pointers[0],j=b.o.pointers[1]?b.o.pointers[1]:null,k=e.originalEvent?e.originalEvent:e,l=f?k.pageY:k.pageX,m=f?"top":"left",n={left:h.left,top:h.top,width:b.domNode[0].clientWidth,height:b.domNode[0].clientHeight},o=b.o.pointers[g];if(j){j.d.width||c();var p=d.offset(i.ptr)[m],q=d.offset(j.ptr)[m],r=Math.abs((q-p)/2),s=l>=q||l>=q-r;s&&(o=j)}o._parent={offset:n,width:n.width,height:n.height};var t=i._getPageCoords(e);return o.cx=t.x-o.d.left,o.cy=t.y-o.d.top,o.onmousemove(e,t.x,t.y),o.onmouseup(),a.extend(o.d,{left:t.x,top:t.y}),b.redraw(o),!1}}},e.prototype.disable=function(a){this.disabled=a},e.prototype.nice=function(a){return a},e.prototype.onstatechange=function(){},e.prototype.limits=function(a,b){if(!this.settings.smooth){var c=100*this.settings.step/this.settings.interval;a=Math.round(a/c)*c}if(b){var d=this.o.pointers[1-b.uid];d&&b.uid&&a<d.value.prc&&(a=d.value.prc),d&&!b.uid&&a>d.value.prc&&(a=d.value.prc)}return 0>a&&(a=0),a>100&&(a=100),Math.round(10*a)/10},e.prototype.getPointers=function(){return this.o.pointers},e.prototype.generateScale=function(){if(this.settings.scale&&this.settings.scale.length>0){for(var a,b,c="",d=this.settings.scale,e={},f=this.settings.vertical?"top":"left",g=0;g<d.length;g++)d[g].val||(a=(100/(d.length-1)).toFixed(2),c+='<span style="'+f+": "+g*a+'%">'+("|"!=d[g]?"<ins>"+d[g]+"</ins>":"")+"</span>"),d[g].val<=this.settings.to&&d[g].val>=this.settings.from&&!e[d[g].val]&&(e[d[g].val]=!0,a=this.valueToPrc(d[g].val),b=d[g].label?d[g].label:d[g].val,c+='<span style="'+f+": "+a+'%"><ins>'+b+"</ins></span>");return c}return""},e.prototype.onresize=function(){var b=this;this.sizes={domWidth:this.domNode[0].clientWidth,domHeight:this.domNode[0].clientHeight,domOffset:{left:this.domNode[0].offsetLeft,top:this.domNode[0].offsetTop,width:this.domNode[0].clientWidth,height:this.domNode[0].clientHeight}},a.forEach(this.o.pointers,function(a,c){b.redraw(a)})},e.prototype.update=function(){this.onresize(),this.drawScale()},e.prototype.drawScale=function(b){a.forEach(a.element(b).find("ins"),function(a,b){a.style.marginLeft=-a.clientWidth/2})},e.prototype.redraw=function(b){if(!this.is.init)return this.o.pointers[0]&&!this.o.pointers[1]?(this.originValue=this.o.pointers[0].value.prc,this.o.indicators[0].css(this.settings.vertical?{top:0,height:this.o.pointers[0].value.prc+"%"}:{left:0,width:this.o.pointers[0].value.prc+"%"}),this.o.indicators[1].css(this.settings.vertical?{top:this.o.pointers[0].value.prc+"%"}:{left:this.o.pointers[0].value.prc+"%"}),this.o.indicators[3].css(this.settings.vertical?{top:this.o.pointers[0].value.prc+"%"}:{left:this.o.pointers[0].value.prc+"%"})):(this.o.indicators[2].css(this.settings.vertical?{top:this.o.pointers[1].value.prc+"%"}:{left:this.o.pointers[1].value.prc+"%"}),this.o.indicators[0].css(this.settings.vertical?{top:0,height:"0"}:{left:0,width:"0"}),this.o.indicators[3].css(this.settings.vertical?{top:"0",height:"0"}:{left:"0",width:"0"})),!1;this.setValue();var c,d;this.o.pointers[0]&&this.o.pointers[1]&&(c=this.settings.vertical?{top:this.o.pointers[0].value.prc+"%",height:this.o.pointers[1].value.prc-this.o.pointers[0].value.prc+"%"}:{left:this.o.pointers[0].value.prc+"%",width:this.o.pointers[1].value.prc-this.o.pointers[0].value.prc+"%"},this.o.value.css(c),this.o.pointers[0].value.prc===this.o.pointers[1].value.prc&&this.o.pointers[1].ptr.css("z-index",0===this.o.pointers[0].value.prc?"3":"1")),this.o.pointers[0]&&!this.o.pointers[1]&&(d=this.o.pointers[0].value.prc-this.originValue,d>=0?this.o.indicators[3].css(this.settings.vertical?{height:d+"%"}:{width:d+"%"}):this.o.indicators[3].css(this.settings.vertical?{height:0}:{width:0}),this.o.pointers[0].value.prc<this.originValue?this.o.indicators[0].css(this.settings.vertical?{height:this.o.pointers[0].value.prc+"%"}:{width:this.o.pointers[0].value.prc+"%"}):this.o.indicators[0].css(this.settings.vertical?{height:this.originValue+"%"}:{width:this.originValue+"%"}));var e=this.nice(b.value.origin);this.settings.modelLabels&&(e=a.isFunction(this.settings.modelLabels)?this.settings.modelLabels(e):void 0!==this.settings.modelLabels[e]?this.settings.modelLabels[e]:e),this.o.labels[b.uid].value.html(e),this.redrawLabels(b)},e.prototype.redrawLabels=function(a){function b(a,b,d){b.margin=-b.label/2;var e=c.settings.vertical?c.sizes.domHeight:c.sizes.domWidth;if(c.sizes.domWidth){var f=b.border+b.margin;0>f&&(b.margin-=f),c.sizes.domWidth>0&&b.border+b.label/2>e?(b.margin=0,b.right=!0):b.right=!1}return c.settings.vertical?a.o.css({top:d+"%",marginLeft:"20px",marginTop:b.margin,bottom:"auto"}):a.o.css({left:d+"%",marginLeft:b.margin+"px",right:"auto"}),b.right&&c.sizes.domWidth>0&&(c.settings.vertical?a.o.css({top:"auto",bottom:0}):a.o.css({left:"auto",right:0})),b}var c=this,d=this.o.labels[a.uid],e=a.value.prc,f=0===d.o[0].offsetWidth?7*d.o[0].textContent.length:d.o[0].offsetWidth;this.sizes.domWidth=this.domNode[0].clientWidth,this.sizes.domHeight=this.domNode[0].clientHeight;var g,h,i={label:c.settings.vertical?d.o[0].offsetHeight:f,right:!1,border:e*(c.settings.vertical?this.sizes.domHeight:this.sizes.domWidth)/100},j=0===a.uid?1:0;if(!this.settings.single&&!this.settings.vertical){g=this.o.labels[j],h=this.o.pointers[j];var k=this.o.labels[0],l=this.o.labels[1],m=this.o.pointers[0],n=this.o.pointers[1],o=n.ptr[0].offsetLeft-m.ptr[0].offsetLeft,p=this.nice(h.value.origin);if(k.o.css(this.css.visible),l.o.css(this.css.visible),p=this.getLabelValue(p),o+10<k.o[0].offsetWidth+l.o[0].offsetWidth){if(g.o.css(this.css.hidden),g.value.html(p),e=(h.value.prc-e)/2+e,h.value.prc!=a.value.prc){p=this.nice(this.o.pointers[0].value.origin);var q=this.nice(this.o.pointers[1].value.origin);p=this.getLabelValue(p),q=this.getLabelValue(q),d.value.html(p+"&nbsp;&ndash;&nbsp;"+q),i.label=d.o[0].offsetWidth,i.border=e*r/100}}else g.value.html(p),g.o.css(this.css.visible)}i=b(d,i,e);var r=c.settings.vertical?c.sizes.domHeight:c.sizes.domWidth;if(g){var s=0===d.o[0].offsetWidth?d.o[0].textContent.length/2*7:d.o[0].offsetWidth,t={label:c.settings.vertical?g.o[0].offsetHeight:s,right:!1,border:h.value.prc*this.sizes.domWidth/100};i=b(g,t,h.value.prc)}this.redrawLimits()},e.prototype.redrawLimits=function(){if(this.settings.limits){var b=[!0,!0],c=0;for(var d in this.o.pointers)if(!this.settings.single||0===d){var e=this.o.pointers[d],f=this.o.labels[e.uid],g=f.o[0].offsetLeft-this.sizes.domOffset.left,h=this.o.limits[0];g<h[0].clientWidth&&(b[0]=!1),h=this.o.limits[1],g+f.o[0].clientWidth>this.sizes.domWidth-h[0].clientWidth&&(b[1]=!1)}for(;c<b.length;c++)b[c]?a.element(this.o.limits[c]).addClass("animate-show"):a.element(this.o.limits[c]).addClass("animate-hidde")}},e.prototype.setValue=function(){var a=this.getValue();this.inputNode.attr("value",a),this.onstatechange.call(this,a,this.inputNode)},e.prototype.getValue=function(){if(!this.is.init)return!1;var b=this,c="";return a.forEach(this.o.pointers,function(a,d){void 0===a.value.prc||isNaN(a.value.prc)||(c+=(d>0?";":"")+b.prcToValue(a.value.prc))}),c},e.prototype.getLabelValue=function(b){return this.settings.modelLabels?a.isFunction(this.settings.modelLabels)?this.settings.modelLabels(b):void 0!==this.settings.modelLabels[b]?this.settings.modelLabels[b]:b:b},e.prototype.getPrcValue=function(){if(!this.is.init)return!1;var a="";return a},e.prototype.prcToValue=function(a){var b;if(this.settings.heterogeneity&&this.settings.heterogeneity.length>0)for(var c=this.settings.heterogeneity,d=0,e=this.settings.round?parseFloat(this.settings.from):parseInt(this.settings.from,10),f=this.settings.round?parseFloat(this.settings.to):parseInt(this.settings.to,10),g=0;g<=c.length;g++){var h;h=c[g]?c[g].split("/"):[100,f];var i=this.settings.round?parseFloat(h[0]):parseInt(h[0],10),j=this.settings.round?parseFloat(h[1]):parseInt(h[1],10);a>=d&&i>=a&&(b=e+(a-d)*(j-e)/(i-d)),d=i,e=j}else b=this.settings.from+a*this.settings.interval/100;return this.round(b)},e.prototype.valueToPrc=function(a,b){var c,d=this.settings.round?parseFloat(this.settings.from):parseInt(this.settings.from,10);if(this.settings.heterogeneity&&this.settings.heterogeneity.length>0)for(var e=this.settings.heterogeneity,f=0,g=0;g<=e.length;g++){var h;h=e[g]?e[g].split("/"):[100,this.settings.to];var i=this.settings.round?parseFloat(h[0]):parseInt(h[0],10),j=this.settings.round?parseFloat(h[1]):parseInt(h[1],10);a>=d&&j>=a&&(c=b?b.limits(f+(a-d)*(i-f)/(j-d)):this.limits(f+(a-d)*(i-f)/(j-d))),f=i,d=j}else c=b?b.limits(100*(a-d)/this.settings.interval):this.limits(100*(a-d)/this.settings.interval);return c},e.prototype.round=function(a){return a=Math.round(a/this.settings.step)*this.settings.step,a=this.settings.round?Math.round(a*Math.pow(10,this.settings.round))/Math.pow(10,this.settings.round):Math.round(a)},e}])}(angular),function(a,b){"use strict";a.module("angularAwesomeSlider").run(["$templateCache",function(a){a.put("ng-slider/slider-bar.tmpl.html",'<span ng-class="mainSliderClass" id="{{sliderTmplId}}"><table><tr><td><div class="jslider-bg"><i class="left"></i><i class="right"></i><i class="range"></i><i class="before"></i><i class="default"></i><i class="default"></i><i class="after"></i></div><div class="jslider-pointer"></div><div class="jslider-pointer jslider-pointer-to"></div><div class="jslider-label" ng-show="options.limits"><span ng-bind="limitValue(options.from)"></span>{{options.dimension}}</div><div class="jslider-label jslider-label-to" ng-show="options.limits"><span ng-bind="limitValue(options.to)"></span>{{options.dimension}}</div><div class="jslider-value"><span></span>{{options.dimension}}</div><div class="jslider-value jslider-value-to"><span></span>{{options.dimension}}</div><div class="jslider-scale" id="{{sliderScaleDivTmplId}}"></div></td></tr></table></span>')}])}(window.angular); \ No newline at end of file
+!function(a){"use strict";a.module("angularAwesomeSlider",[]).directive("slider",["$compile","$templateCache","$timeout","$window","slider",function(b,c,d,e,f){return{restrict:"AE",require:"?ngModel",scope:{options:"=",ngDisabled:"="},priority:1,link:function(g,h,i,j){function k(){
+// window resize listener
+a.element(e).bind("resize",function(a){g.slider.onresize()})}if(j){if(!g.options)throw new Error('You must provide a value for "options" attribute.');a.injector();
+// options as inline variable
+a.isString(g.options)&&(g.options=a.toJson(g.options)),g.mainSliderClass="jslider",g.mainSliderClass+=g.options.skin?" jslider_"+g.options.skin:" ",g.mainSliderClass+=g.options.vertical?" vertical ":"",g.mainSliderClass+=g.options.css?" sliderCSS":"",g.mainSliderClass+=g.options.className?" "+g.options.className:"",
+// handle limit labels visibility
+g.options.limits=a.isDefined(g.options.limits)?g.options.limits:!0,
+// compile template
+h.after(b(c.get("ng-slider/slider-bar.tmpl.html"))(g,function(a,b){b.tmplElt=a}));
+// init
+var l=!1,m=function(b){g.from=""+g.options.from,g.to=""+g.options.to,g.options.calculate&&a.isFunction(g.options.calculate)&&(g.from=g.options.calculate(g.from),g.to=g.options.calculate(g.to));var c={from:g.options.round?parseFloat(g.options.from):parseInt(g.options.from,10),to:g.options.round?parseFloat(g.options.to):parseInt(g.options.to,10),step:g.options.step,smooth:g.options.smooth,limits:g.options.limits,round:g.options.round||!1,value:b||j.$viewValue,dimension:"",scale:g.options.scale,modelLabels:g.options.modelLabels,vertical:g.options.vertical,css:g.options.css,className:g.options.className,realtime:g.options.realtime,cb:n,threshold:g.options.threshold,heterogeneity:g.options.heterogeneity};c.calculate=g.options.calculate||void 0,c.onstatechange=g.options.onstatechange||void 0,
+// slider
+g.slider=g.slider?g.slider.init(h,g.tmplElt,c):p(h,g.tmplElt,c),l||k();
+// scale
+var d=g.tmplElt.find("div")[7];a.element(d).html(g.slider.generateScale()),g.slider.drawScale(d),g.ngDisabled&&o(g.ngDisabled),l=!0};
+// model -> view
+j.$render=function(){if((j.$viewValue||0===j.$viewValue)&&("number"==typeof j.$viewValue&&(j.$viewValue=""+j.$viewValue),j.$viewValue.split(";")[1]?g.mainSliderClass=g.mainSliderClass.replace(" jslider-single",""):g.mainSliderClass+=" jslider-single",g.slider)){var a=j.$viewValue.split(";");g.slider.getPointers()[0].set(a[0],!0),a[1]&&(g.slider.getPointers()[1].set(a[1],!0),
+//if moving left to right with two pointers
+//we need to "finish" moving the first
+parseInt(a[1])>parseInt(a[0])&&g.slider.getPointers()[0].set(a[0],!0))}},g.$on("slider-value-update",function(a,b){m(b.value),d(function(){g.slider.redrawPointers()})});
+// view -> model
+var n=function(a,b){g.disabled||(g.$apply(function(){j.$setViewValue(a)}),g.options.callback&&g.options.callback(a,b))};
+// watch options
+g.$watch("options",function(a){d(function(){m()})},g.watchOptions||!0);
+// disabling
+var o=function(a){g.disabled=a,g.slider&&(g.tmplElt.toggleClass("disabled"),g.slider.disable(a))};g.$watch("ngDisabled",function(a){o(a)}),g.limitValue=function(b){return g.options.modelLabels?a.isFunction(g.options.modelLabels)?g.options.modelLabels(b):void 0!==g.options.modelLabels[b]?g.options.modelLabels[b]:b:b};var p=function(a,b,c){return new f(a,b,c)}}}}}]).config(function(){}).run(function(){})}(angular),function(a){"use strict";a.module("angularAwesomeSlider").constant("sliderConstants",{SLIDER:{settings:{from:1,to:40,step:1,smooth:!0,limits:!1,round:!1,value:"3",dimension:"",vertical:!1,calculate:!1,onstatechange:!1,callback:!1,realtime:!1},className:"jslider",selector:".jslider-",css:{visible:{visibility:"visible"},hidden:{visibility:"hidden"}}},EVENTS:{}})}(angular),function(a){"use strict";a.module("angularAwesomeSlider").factory("sliderUtils",["$window",function(a){return{offset:function(a){
+// try {return elm.offset();} catch(e) {}
+var b=a[0],c=0,d=0,e=document.documentElement||document.body,f=window.pageXOffset||e.scrollLeft,g=window.pageYOffset||e.scrollTop;return c=b.getBoundingClientRect().left+f,d=b.getBoundingClientRect().top+g,{left:c,top:d}},browser:function(){
+// TODO finish browser detection and this case
+var b=a.navigator.userAgent,c={mozilla:/mozilla/i,chrome:/chrome/i,safari:/safari/i,firefox:/firefox/i,ie:/internet explorer/i};for(var d in c)if(c[d].test(b))return d;return"unknown"}}}])}(angular),function(a){"use strict";a.module("angularAwesomeSlider").factory("sliderDraggable",["sliderUtils",function(b){function c(){this._init.apply(this,arguments)}return c.prototype.oninit=function(){},c.prototype.events=function(){},c.prototype.onmousedown=function(){this.ptr.css({position:"absolute"})},c.prototype.onmousemove=function(a,b,c){this.ptr.css({left:b,top:c})},c.prototype.onmouseup=function(){},c.prototype.isDefault={drag:!1,clicked:!1,toclick:!0,mouseup:!1},c.prototype._init=function(){if(arguments.length>0){if(this.ptr=arguments[0],this.label=arguments[3],this.parent=arguments[2],!this.ptr)return;
+//this.outer = $(".draggable-outer");
+this.is={},a.extend(this.is,this.isDefault);var c=b.offset(this.ptr);this.d={left:c.left,top:c.top,width:this.ptr[0].clientWidth,height:this.ptr[0].clientHeight},this.oninit.apply(this,arguments),this._events()}},c.prototype._getPageCoords=function(a){return a.targetTouches&&a.targetTouches[0]?{x:a.targetTouches[0].pageX,y:a.targetTouches[0].pageY}:{x:a.pageX,y:a.pageY}},c.prototype._bindEvent=function(a,b,c){
+// PS need to bind to touch and non-touch events for devices which support both
+this.supportTouches_&&a[0].addEventListener(this.events_[b].touch,c,!1),a.bind(this.events_[b].nonTouch,c)},c.prototype._events=function(){var b=this;this.supportTouches_="ontouchend"in document,this.events_={click:{touch:"touchstart",nonTouch:"click"},down:{touch:"touchstart",nonTouch:"mousedown"},move:{touch:"touchmove",nonTouch:"mousemove"},up:{touch:"touchend",nonTouch:"mouseup"},mousedown:{touch:"mousedown",nonTouch:"mousedown"}};var c=a.element(window.document);this._bindEvent(c,"move",function(a){b.is.drag&&(a.stopPropagation(),a.preventDefault(),b.parent.disabled||b._mousemove(a))}),this._bindEvent(c,"down",function(a){b.is.drag&&(a.stopPropagation(),a.preventDefault())}),this._bindEvent(c,"up",function(a){b._mouseup(a)}),this._bindEvent(this.label,"down",function(a){return b._mousedown(a),!1}),this._bindEvent(this.label,"up",function(a){b._mouseup(a)}),this._bindEvent(this.ptr,"down",function(a){return b._mousedown(a),!1}),this._bindEvent(this.ptr,"up",function(a){b._mouseup(a)}),
+// TODO see if needed
+this.events()},c.prototype._mousedown=function(b){this.is.drag=!0,this.is.clicked=!1,this.is.mouseup=!1;var c=this._getPageCoords(b);this.cx=c.x-this.ptr[0].offsetLeft,this.cy=c.y-this.ptr[0].offsetTop,a.extend(this.d,{left:c.x,top:c.y,width:this.ptr[0].clientWidth,height:this.ptr[0].clientHeight}),this.outer&&this.outer.get(0)&&this.outer.css({height:Math.max(this.outer.height(),$(document.body).height()),overflow:"hidden"}),this.onmousedown(b)},c.prototype._mousemove=function(a){this.is.toclick=!1;var b=this._getPageCoords(a);this.onmousemove(a,b.x-this.cx,b.y-this.cy)},c.prototype._mouseup=function(a){if(this.is.drag){this.is.drag=!1;var c=b.browser();this.outer&&this.outer.get(0)&&("mozilla"===c?this.outer.css({overflow:"hidden"}):this.outer.css({overflow:"visible"}),
+// TODO finish browser detection and this case, remove following line
+this.outer.css({height:"auto"})),this.onmouseup(a)}},c}])}(angular),function(a){"use strict";a.module("angularAwesomeSlider").factory("sliderPointer",["sliderDraggable","sliderUtils",function(b,c){function d(){b.apply(this,arguments)}return d.prototype=new b,d.prototype.oninit=function(b,c,d,e,f){this.uid=c,this.parent=f,this.value={},this.vertical=d,this.settings=a.copy(f.settings),this.threshold=this.settings.threshold},d.prototype.onmousedown=function(a){var b=c.offset(this.parent.domNode),d={left:b.left,top:b.top,width:this.parent.domNode[0].clientWidth,height:this.parent.domNode[0].clientHeight};this._parent={offset:d,width:d.width,height:d.height},this.ptr.addClass("jslider-pointer-hover")},d.prototype.onmousemove=function(b,c,d){var e=this._getPageCoords(b);this._set(this.vertical?this.calc(e.y):this.calc(e.x)),this.settings.realtime&&this.settings.cb&&a.isFunction(this.settings.cb)&&this.settings.cb.call(this.parent,this.parent.getValue(),!this.is.drag)},d.prototype.onmouseup=function(b){this.settings.cb&&a.isFunction(this.settings.cb)&&this.settings.cb.call(this.parent,this.parent.getValue(),!this.is.drag),this.is.drag||this.ptr.removeClass("jslider-pointer-hover")},d.prototype.limits=function(a){return this.parent.limits(a,this)},d.prototype.calc=function(a){return this.vertical?this.limits(100*(a-this._parent.offset.top)/this._parent.height):this.limits(100*(a-this._parent.offset.left)/this._parent.width)},d.prototype.set=function(a,b){this.value.origin=this.parent.round(a),this._set(this.parent.valueToPrc(a,this),b)},d.prototype._set=function(a,b){this.allowed=!0;var c=this.value.origin,d=this.value.prc;
+// check threshold
+if(this.value.origin=this.parent.prcToValue(a),this.value.prc=a,this.threshold&&this.parent.o.pointers[1]){var e=this.value.origin,f=this.parent.o.pointers[0===this.uid?1:0].value.origin;this.allowed=Math.abs(f-e)>=this.threshold,this.allowed||void 0===c||void 0===d||(this.value.origin=c,this.value.prc=d)}this.vertical?this.ptr.css({top:this.value.prc+"%",marginTop:-5}):this.ptr.css({left:this.value.prc+"%"}),this.parent.redraw(this)},d}])}(angular),function(a){"use strict";a.module("angularAwesomeSlider").factory("slider",["sliderPointer","sliderConstants","sliderUtils",function(b,c,d){function e(){return this.init.apply(this,arguments)}return e.prototype.init=function(b,d,e){return this.settings=e,this.inputNode=b,this.inputNode.addClass("ng-hide"),this.settings.interval=this.settings.to-this.settings.from,this.settings.calculate&&a.isFunction(this.settings.calculate)&&(this.nice=this.settings.calculate),this.settings.onstatechange&&a.isFunction(this.settings.onstatechange)&&(this.onstatechange=this.settings.onstatechange),this.css=c.SLIDER.css,this.is={init:!1},this.o={},this.initValue={},this.isAsc=e.from<e.to,this.create(d),this},e.prototype.create=function(c){
+// set skin class
+// if( this.settings.skin && this.settings.skin.length > 0 )
+// this.setSkin( this.settings.skin );
+var e=this;this.domNode=c;var f=this.domNode.find("div"),g=this.domNode.find("i"),h=a.element,i=a.extend,j=a.forEach,k=h(f[1]),l=h(f[2]),m=h(f[5]),n=h(f[6]),o=h(g[0]),p=h(g[1]),q=h(g[2]),r=h(g[3]),s=h(g[4]),t=h(g[5]),u=h(g[6]),v=[m,n],w=[k,l],x=d.offset(this.domNode),y={left:x.left,top:x.top,width:this.domNode[0].clientWidth,height:this.domNode[0].clientHeight},z=e.settings.value.split(";");this.sizes={domWidth:this.domNode[0].clientWidth,domHeight:this.domNode[0].clientHeight,domOffset:y},
+// find some objects
+i(this.o,{pointers:{},labels:{0:{o:m},1:{o:n}},limits:{0:a.element(f[3]),1:a.element(f[4])},indicators:{0:r,1:s,2:t,3:u}}),i(this.o.labels[0],{value:this.o.labels[0].o.find("span")}),i(this.o.labels[1],{value:this.o.labels[1].o.find("span")}),
+// single pointer
+this.settings.single=!e.settings.value.split(";")[1],this.settings.single?q.addClass("ng-hide"):q.removeClass("ng-hide"),j(w,function(c,f){e.settings=a.copy(e.settings);var g,h,i,j,k,l=z[f];l&&(e.o.pointers[f]=new b(c,f,e.settings.vertical,v[f],e),g=z[f-1],h=g?parseInt(g,10):void 0,l=e.settings.round?parseFloat(l):parseInt(l,10),(g&&e.isAsc?h>l:l>h)&&(l=g),i=e.isAsc?l>e.settings.to:l<e.settings.to,j=i?e.settings.to:l,e.o.pointers[f].set(j,!0),k=d.offset(e.o.pointers[f].ptr),e.o.pointers[f].d={left:k.left,top:k.top})}),e.domNode.bind("mousedown",e.clickHandler.apply(e)),this.o.value=h(this.domNode.find("i")[2]),this.is.init=!0,
+// CSS SKIN
+this.settings.css&&(o.css(this.settings.css.background?this.settings.css.background:{}),p.css(this.settings.css.background?this.settings.css.background:{}),this.o.pointers[1]||(r.css(this.settings.css.before?this.settings.css.before:{}),u.css(this.settings.css.after?this.settings.css.after:{})),s.css(this.settings.css["default"]?this.settings.css["default"]:{}),t.css(this.settings.css["default"]?this.settings.css["default"]:{}),q.css(this.settings.css.range?this.settings.css.range:{}),k.css(this.settings.css.pointer?this.settings.css.pointer:{}),l.css(this.settings.css.pointer?this.settings.css.pointer:{})),this.redrawPointers()},e.prototype.clickHandler=function(){var b=this,c=function(a){var c=b.o.pointers[0].ptr,e=b.o.pointers[1].ptr,f=d.offset(c),g=d.offset(e);b.o.pointers[0].d={left:f.left,top:f.top,width:c[0].clientWidth,height:c[0].clientHeight},b.o.pointers[1].d={left:g.left,top:g.top,width:e[0].clientWidth,height:e[0].clientHeight}};return function(e){if(!b.disabled){var f=b.settings.vertical,g=0,h=d.offset(b.domNode),i=b.o.pointers[0],j=b.o.pointers[1]?b.o.pointers[1]:null,k=e.originalEvent?e.originalEvent:e,l=f?k.pageY:k.pageX,m=f?"top":"left",n={left:h.left,top:h.top,width:b.domNode[0].clientWidth,height:b.domNode[0].clientHeight},o=b.o.pointers[g];if(j){j.d.width||c();var p=d.offset(i.ptr)[m],q=d.offset(j.ptr)[m],r=Math.abs((q-p)/2),s=l>=q||l>=q-r;s&&(o=j)}o._parent={offset:n,width:n.width,height:n.height};var t=i._getPageCoords(e);return o.cx=t.x-o.d.left,o.cy=t.y-o.d.top,o.onmousemove(e,t.x,t.y),o.onmouseup(),a.extend(o.d,{left:t.x,top:t.y}),b.redraw(o),!1}}},e.prototype.disable=function(a){this.disabled=a},e.prototype.nice=function(a){return a},e.prototype.onstatechange=function(){},e.prototype.limits=function(a,b){
+// smooth
+if(!this.settings.smooth){var c=100*this.settings.step/this.settings.interval;a=Math.round(a/c)*c}if(b){var d=this.o.pointers[1-b.uid];d&&b.uid&&a<d.value.prc&&(a=d.value.prc),d&&!b.uid&&a>d.value.prc&&(a=d.value.prc)}
+// base limit
+return 0>a&&(a=0),a>100&&(a=100),Math.round(10*a)/10},e.prototype.getPointers=function(){return this.o.pointers},e.prototype.generateScale=function(){if(this.settings.scale&&this.settings.scale.length>0){for(var
+// FIX Big Scale Failure #34
+// var prc = Math.round((100/(s.length-1))*10)/10;
+b,c,d="",e=this.settings.scale,f={},g=this.settings.vertical?"top":"left",h=0;h<e.length;h++)a.isDefined(e[h].val)||(b=(100/(e.length-1)).toFixed(2),d+='<span style="'+g+": "+h*b+'%">'+("|"!=e[h]?"<ins>"+e[h]+"</ins>":"")+"</span>"),e[h].val<=this.settings.to&&e[h].val>=this.settings.from&&!f[e[h].val]&&(f[e[h].val]=!0,b=this.valueToPrc(e[h].val),c=e[h].label?e[h].label:e[h].val,d+='<span style="'+g+": "+b+'%"><ins>'+c+"</ins></span>");return d}return""},e.prototype.onresize=function(){this.sizes={domWidth:this.domNode[0].clientWidth,domHeight:this.domNode[0].clientHeight,domOffset:{left:this.domNode[0].offsetLeft,top:this.domNode[0].offsetTop,width:this.domNode[0].clientWidth,height:this.domNode[0].clientHeight}},this.redrawPointers()},e.prototype.update=function(){this.onresize(),this.drawScale()},e.prototype.drawScale=function(b){a.forEach(a.element(b).find("ins"),function(a,b){a.style.marginLeft=-a.clientWidth/2})},e.prototype.redrawPointers=function(){a.forEach(this.o.pointers,function(a){this.redraw(a)},this)},e.prototype.redraw=function(b){if(!this.is.init)
+// this.settings.single
+return this.o.pointers[0]&&!this.o.pointers[1]?(this.originValue=this.o.pointers[0].value.prc,this.o.indicators[0].css(this.settings.vertical?{top:0,height:this.o.pointers[0].value.prc+"%"}:{left:0,width:this.o.pointers[0].value.prc+"%"}),this.o.indicators[1].css(this.settings.vertical?{top:this.o.pointers[0].value.prc+"%"}:{left:this.o.pointers[0].value.prc+"%"}),this.o.indicators[3].css(this.settings.vertical?{top:this.o.pointers[0].value.prc+"%"}:{left:this.o.pointers[0].value.prc+"%"})):(this.o.indicators[2].css(this.settings.vertical?{top:this.o.pointers[1].value.prc+"%"}:{left:this.o.pointers[1].value.prc+"%"}),this.o.indicators[0].css(this.settings.vertical?{top:0,height:"0"}:{left:0,width:"0"}),this.o.indicators[3].css(this.settings.vertical?{top:"0",height:"0"}:{left:"0",width:"0"})),!1;this.setValue();var c,d;
+// redraw range line
+this.o.pointers[0]&&this.o.pointers[1]&&(c=this.settings.vertical?{top:this.o.pointers[0].value.prc+"%",height:this.o.pointers[1].value.prc-this.o.pointers[0].value.prc+"%"}:{left:this.o.pointers[0].value.prc+"%",width:this.o.pointers[1].value.prc-this.o.pointers[0].value.prc+"%"},this.o.value.css(c),this.o.pointers[0].value.prc===this.o.pointers[1].value.prc&&this.o.pointers[1].ptr.css("z-index",0===this.o.pointers[0].value.prc?"3":"1")),this.o.pointers[0]&&!this.o.pointers[1]&&(d=this.o.pointers[0].value.prc-this.originValue,d>=0?this.o.indicators[3].css(this.settings.vertical?{height:d+"%"}:{width:d+"%"}):this.o.indicators[3].css(this.settings.vertical?{height:0}:{width:0}),this.o.pointers[0].value.prc<this.originValue?this.o.indicators[0].css(this.settings.vertical?{height:this.o.pointers[0].value.prc+"%"}:{width:this.o.pointers[0].value.prc+"%"}):this.o.indicators[0].css(this.settings.vertical?{height:this.originValue+"%"}:{width:this.originValue+"%"}));var e=this.nice(b.value.origin);this.settings.modelLabels&&(e=a.isFunction(this.settings.modelLabels)?this.settings.modelLabels(e):void 0!==this.settings.modelLabels[e]?this.settings.modelLabels[e]:e),this.o.labels[b.uid].value.html(e),
+// redraw position of labels
+this.redrawLabels(b)},e.prototype.redrawLabels=function(a){function b(a,b,d){b.margin=-b.label/2;var e=c.settings.vertical?c.sizes.domHeight:c.sizes.domWidth;if(c.sizes.domWidth){
+// left limit
+var f=b.border+b.margin;0>f&&(b.margin-=f),
+// right limit
+c.sizes.domWidth>0&&b.border+b.label/2>e?(b.margin=0,b.right=!0):b.right=!1}return c.settings.vertical?a.o.css({top:d+"%",marginLeft:"20px",marginTop:b.margin,bottom:"auto"}):a.o.css({left:d+"%",marginLeft:b.margin+"px",right:"auto"}),b.right&&c.sizes.domWidth>0&&(c.settings.vertical?a.o.css({top:"auto",bottom:0}):a.o.css({left:"auto",right:0})),b}var c=this,d=this.o.labels[a.uid],e=a.value.prc,
+// case hidden
+f=0===d.o[0].offsetWidth?7*d.o[0].textContent.length:d.o[0].offsetWidth;this.sizes.domWidth=this.domNode[0].clientWidth,this.sizes.domHeight=this.domNode[0].clientHeight;var g,h,i={label:c.settings.vertical?d.o[0].offsetHeight:f,right:!1,border:e*(c.settings.vertical?this.sizes.domHeight:this.sizes.domWidth)/100},j=0===a.uid?1:0;if(!this.settings.single&&!this.settings.vertical){
+// glue if near;
+g=this.o.labels[j],h=this.o.pointers[j];var k=this.o.labels[0],l=this.o.labels[1],m=this.o.pointers[0],n=this.o.pointers[1],o=n.ptr[0].offsetLeft-m.ptr[0].offsetLeft,p=this.nice(h.value.origin);if(k.o.css(this.css.visible),l.o.css(this.css.visible),p=this.getLabelValue(p),o+10<k.o[0].offsetWidth+l.o[0].offsetWidth){if(g.o.css(this.css.hidden),g.value.html(p),e=(h.value.prc-e)/2+e,h.value.prc!=a.value.prc){p=this.nice(this.o.pointers[0].value.origin);var q=this.nice(this.o.pointers[1].value.origin);p=this.getLabelValue(p),q=this.getLabelValue(q),d.value.html(p+"&nbsp;&ndash;&nbsp;"+q),i.label=d.o[0].offsetWidth,i.border=e*r/100}}else g.value.html(p),g.o.css(this.css.visible)}i=b(d,i,e);var r=c.settings.vertical?c.sizes.domHeight:c.sizes.domWidth;/* draw second label */
+if(g){
+// case hidden
+var s=0===d.o[0].offsetWidth?d.o[0].textContent.length/2*7:d.o[0].offsetWidth,t={label:c.settings.vertical?g.o[0].offsetHeight:s,right:!1,border:h.value.prc*this.sizes.domWidth/100};i=b(g,t,h.value.prc)}this.redrawLimits()},e.prototype.redrawLimits=function(){if(this.settings.limits){var b=[!0,!0],c=0;for(var d in this.o.pointers)if(!this.settings.single||0===d){var e=this.o.pointers[d],f=this.o.labels[e.uid],g=f.o[0].offsetLeft-this.sizes.domOffset.left,h=this.o.limits[0];g<h[0].clientWidth&&(b[0]=!1),h=this.o.limits[1],g+f.o[0].clientWidth>this.sizes.domWidth-h[0].clientWidth&&(b[1]=!1)}for(;c<b.length;c++)b[c]?// TODO animate
+a.element(this.o.limits[c]).addClass("animate-show"):a.element(this.o.limits[c]).addClass("animate-hidde")}},e.prototype.setValue=function(){var a=this.getValue();this.inputNode.attr("value",a),this.onstatechange.call(this,a,this.inputNode)},e.prototype.getValue=function(){if(!this.is.init)return!1;var b=this,c="";return a.forEach(this.o.pointers,function(a,d){void 0===a.value.prc||isNaN(a.value.prc)||(c+=(d>0?";":"")+b.prcToValue(a.value.prc))}),c},e.prototype.getLabelValue=function(b){return this.settings.modelLabels?a.isFunction(this.settings.modelLabels)?this.settings.modelLabels(b):void 0!==this.settings.modelLabels[b]?this.settings.modelLabels[b]:b:b},e.prototype.getPrcValue=function(){if(!this.is.init)return!1;var a="";
+// TODO remove jquery and see if % value is nice feature
+/*$.each(this.o.pointers, function(i){
+ if(this.value.prc !== undefined && !isNaN(this.value.prc)) value += (i > 0 ? ";" : "") + this.value.prc;
+ });*/
+return a},e.prototype.prcToValue=function(a){var b;if(this.settings.heterogeneity&&this.settings.heterogeneity.length>0)for(var c=this.settings.heterogeneity,d=0,e=this.settings.round?parseFloat(this.settings.from):parseInt(this.settings.from,10),f=this.settings.round?parseFloat(this.settings.to):parseInt(this.settings.to,10),g=0;g<=c.length;g++){var h;h=c[g]?c[g].split("/"):[100,f];var i=this.settings.round?parseFloat(h[0]):parseInt(h[0],10),j=this.settings.round?parseFloat(h[1]):parseInt(h[1],10);a>=d&&i>=a&&(b=e+(a-d)*(j-e)/(i-d)),d=i,e=j}else b=this.settings.from+a*this.settings.interval/100;return this.round(b)},e.prototype.valueToPrc=function(a,b){var c,d=this.settings.round?parseFloat(this.settings.from):parseInt(this.settings.from,10);if(this.settings.heterogeneity&&this.settings.heterogeneity.length>0)for(var e=this.settings.heterogeneity,f=0,g=0;g<=e.length;g++){var h;h=e[g]?e[g].split("/"):[100,this.settings.to];var i=this.settings.round?parseFloat(h[0]):parseInt(h[0],10),j=this.settings.round?parseFloat(h[1]):parseInt(h[1],10);a>=d&&j>=a&&(c=b?b.limits(f+(a-d)*(i-f)/(j-d)):this.limits(f+(a-d)*(i-f)/(j-d))),f=i,d=j}else c=b?b.limits(100*(a-d)/this.settings.interval):this.limits(100*(a-d)/this.settings.interval);return c},e.prototype.round=function(a){return a=Math.round(a/this.settings.step)*this.settings.step,a=this.settings.round?Math.round(a*Math.pow(10,this.settings.round))/Math.pow(10,this.settings.round):Math.round(a)},e}])}(angular),function(a,b){"use strict";a.module("angularAwesomeSlider").run(["$templateCache",function(a){a.put("ng-slider/slider-bar.tmpl.html",'<span ng-class="mainSliderClass" id="{{sliderTmplId}}"><table><tr><td><div class="jslider-bg"><i class="left"></i><i class="right"></i><i class="range"></i><i class="before"></i><i class="default"></i><i class="default"></i><i class="after"></i></div><div class="jslider-pointer"></div><div class="jslider-pointer jslider-pointer-to"></div><div class="jslider-label" ng-show="options.limits"><span ng-bind="limitValue(options.from)"></span>{{options.dimension}}</div><div class="jslider-label jslider-label-to" ng-show="options.limits"><span ng-bind="limitValue(options.to)"></span>{{options.dimension}}</div><div class="jslider-value"><span></span>{{options.dimension}}</div><div class="jslider-value jslider-value-to"><span></span>{{options.dimension}}</div><div class="jslider-scale" id="{{sliderScaleDivTmplId}}"></div></td></tr></table></span>')}])}(window.angular); \ No newline at end of file
diff --git a/www/lib/angular-awesome-slider/dist/css/angular-awesome-slider.min.css b/www/lib/angular-awesome-slider/dist/css/angular-awesome-slider.min.css
index ea5da4dd..d5ded6b2 100644
--- a/www/lib/angular-awesome-slider/dist/css/angular-awesome-slider.min.css
+++ b/www/lib/angular-awesome-slider/dist/css/angular-awesome-slider.min.css
@@ -1,5 +1,5 @@
/**
-* @license angular-awesome-slider - v2.4.2
+* @license angular-awesome-slider - v2.4.4
* (c) 2013 Julien VALERY https://github.com/darul75/angular-awesome-slider
* License: MIT
**/
diff --git a/www/lib/angular-awesome-slider/package.json b/www/lib/angular-awesome-slider/package.json
index 133d0557..45b0f019 100644
--- a/www/lib/angular-awesome-slider/package.json
+++ b/www/lib/angular-awesome-slider/package.json
@@ -1,13 +1,14 @@
{
"name": "angular-awesome-slider",
"description": "AngularJS directive slider control.",
- "version": "2.4.2",
+ "version": "2.4.4",
"license": "MIT",
"author": {
"name": "Julien Valéry",
"email": "darul75@gmail.com"
},
"filename": "./src/ng-slider.js",
+ "main": "dist/angular-awesome-slider.js",
"homepage": "https://github.com/darul75/angular-awesome-slider",
"repository": {
"type": "git",
diff --git a/www/lib/angular-awesome-slider/src/core/index.js b/www/lib/angular-awesome-slider/src/core/index.js
index 069c02df..3669e1f2 100644
--- a/www/lib/angular-awesome-slider/src/core/index.js
+++ b/www/lib/angular-awesome-slider/src/core/index.js
@@ -43,13 +43,13 @@
var initialized = false;
- var init = function() {
+ var init = function(value) {
scope.from = ''+scope.options.from;
scope.to = ''+scope.options.to;
- if (scope.options.calculate && typeof scope.options.calculate === 'function') {
+ if (scope.options.calculate && angular.isFunction(scope.options.calculate)) {
scope.from = scope.options.calculate(scope.from);
scope.to = scope.options.calculate(scope.to);
- }
+ }
var OPTIONS = {
from: !scope.options.round ? parseInt(scope.options.from, 10) : parseFloat(scope.options.from),
@@ -58,8 +58,8 @@
smooth: scope.options.smooth,
limits: scope.options.limits,
round: scope.options.round || false,
- value: ngModel.$viewValue,
- dimension: "",
+ value: value || ngModel.$viewValue,
+ dimension: '',
scale: scope.options.scale,
modelLabels: scope.options.modelLabels,
vertical: scope.options.vertical,
@@ -88,7 +88,7 @@
if (scope.ngDisabled) {
disabler(scope.ngDisabled);
- }
+ }
initialized = true;
};
@@ -113,9 +113,12 @@
ngModel.$viewValue = ''+ngModel.$viewValue;
}
- if( !ngModel.$viewValue.split(";")[1]) {
+ if( !ngModel.$viewValue.split(';')[1]) {
scope.mainSliderClass += ' jslider-single';
}
+ else {
+ scope.mainSliderClass = scope.mainSliderClass.replace(' jslider-single', '');
+ }
if (scope.slider) {
var vals = ngModel.$viewValue.split(";");
@@ -123,14 +126,22 @@
if (vals[1]) {
scope.slider.getPointers()[1].set(vals[1], true);
//if moving left to right with two pointers
- //we need to "finish" moving the first
+ //we need to "finish" moving the first
if(parseInt(vals[1]) > parseInt(vals[0])){
scope.slider.getPointers()[0].set(vals[0], true);
}
- }
+ }
}
+
};
+ scope.$on('slider-value-update', function(e, msg){
+ init(msg.value);
+ timeout(function(){
+ scope.slider.redrawPointers();
+ });
+ });
+
// view -> model
var forceApply = function(value, released) {
if (scope.disabled)
@@ -161,14 +172,14 @@
scope.$watch('ngDisabled', function(value) {
disabler(value);
- });
+ });
scope.limitValue = function(value) {
if (scope.options.modelLabels) {
if (angular.isFunction(scope.options.modelLabels)) {
return scope.options.modelLabels(value);
- }
- return scope.options.modelLabels[value] !== undefined ? scope.options.modelLabels[value] : value;
+ }
+ return scope.options.modelLabels[value] !== undefined ? scope.options.modelLabels[value] : value;
}
return value;
};
diff --git a/www/lib/angular-awesome-slider/src/core/model/draggable.factory.js b/www/lib/angular-awesome-slider/src/core/model/draggable.factory.js
index 56dd625f..46cd4d52 100644
--- a/www/lib/angular-awesome-slider/src/core/model/draggable.factory.js
+++ b/www/lib/angular-awesome-slider/src/core/model/draggable.factory.js
@@ -33,6 +33,7 @@
Draggable.prototype._init = function() {
if( arguments.length > 0 ){
this.ptr = arguments[0];
+ this.label = arguments[3];
this.parent = arguments[2];
if (!this.ptr)
@@ -107,6 +108,14 @@
self._mouseup(event);
});
+ this._bindEvent( this.label, 'down', function(event) {
+ self._mousedown( event );
+ return false;
+ });
+ this._bindEvent( this.label, 'up', function(event) {
+ self._mouseup( event );
+ });
+
this._bindEvent( this.ptr, 'down', function(event) {
self._mousedown( event );
return false;
@@ -180,4 +189,4 @@
return Draggable;
}]);
-}(angular)); \ No newline at end of file
+}(angular));
diff --git a/www/lib/angular-awesome-slider/src/core/model/pointer.factory.js b/www/lib/angular-awesome-slider/src/core/model/pointer.factory.js
index 8f938b12..41d31fd0 100644
--- a/www/lib/angular-awesome-slider/src/core/model/pointer.factory.js
+++ b/www/lib/angular-awesome-slider/src/core/model/pointer.factory.js
@@ -9,7 +9,7 @@
SliderPointer.prototype = new Draggable();
- SliderPointer.prototype.oninit = function( ptr, id, vertical, _constructor ) {
+ SliderPointer.prototype.oninit = function( ptr, id, vertical, label, _constructor ) {
this.uid = id;
this.parent = _constructor;
this.value = {};
@@ -97,4 +97,4 @@
return SliderPointer;
}]);
-}(angular)); \ No newline at end of file
+}(angular));
diff --git a/www/lib/angular-awesome-slider/src/core/model/slider.factory.js b/www/lib/angular-awesome-slider/src/core/model/slider.factory.js
index f04672b2..2bc9ab5b 100644
--- a/www/lib/angular-awesome-slider/src/core/model/slider.factory.js
+++ b/www/lib/angular-awesome-slider/src/core/model/slider.factory.js
@@ -7,18 +7,20 @@
return this.init.apply(this, arguments);
}
- Slider.prototype.init = function( inputNode, templateNode, settings ){
- this.settings = settings;
+ Slider.prototype.init = function( inputNode, templateNode, settings ){
+ this.settings = settings;
this.inputNode = inputNode;
- this.inputNode.addClass("ng-hide");
+ this.inputNode.addClass('ng-hide');
this.settings.interval = this.settings.to-this.settings.from;
-
- if(this.settings.calculate && angular.isFunction(this.settings.calculate))
- this.nice = this.settings.calculate;
- if(this.settings.onstatechange && angular.isFunction(this.settings.onstatechange))
+ if(this.settings.calculate && angular.isFunction(this.settings.calculate)) {
+ this.nice = this.settings.calculate;
+ }
+
+ if(this.settings.onstatechange && angular.isFunction(this.settings.onstatechange)) {
this.onstatechange = this.settings.onstatechange;
+ }
this.css = sliderConstants.SLIDER.css;
this.is = {init: false};
@@ -27,7 +29,7 @@
this.isAsc = settings.from < settings.to;
this.create(templateNode);
-
+
return this;
};
@@ -56,20 +58,21 @@
indicator2 = angElt(is[4]),
indicator3 = angElt(is[5]),
indicator4 = angElt(is[6]),
- pointers = [pointer1, pointer2],
+ labels = [pointerLabel1, pointerLabel2],
+ pointers = [pointer1, pointer2],
off = utils.offset(this.domNode),
offset = {
left: off.left,
top: off.top,
width: this.domNode[0].clientWidth,
height: this.domNode[0].clientHeight
- },
+ },
values = self.settings.value.split(';');
- this.sizes = {
+ this.sizes = {
domWidth: this.domNode[0].clientWidth,
domHeight: this.domNode[0].clientHeight,
- domOffset: offset
+ domOffset: offset
};
// find some objects
@@ -87,12 +90,14 @@
angExt(this.o.labels[1], {
value: this.o.labels[1].o.find("span")
});
-
+
// single pointer
- this.settings.single = !self.settings.value.split(";")[1];
+ this.settings.single = !self.settings.value.split(";")[1];
if (this.settings.single) {
range.addClass('ng-hide');
+ } else {
+ range.removeClass('ng-hide');
}
angForEach(pointers, function(pointer, key) {
@@ -106,7 +111,7 @@
offset;
if(value) {
- self.o.pointers[key] = new SliderPointer(pointer, key, self.settings.vertical, self);
+ self.o.pointers[key] = new SliderPointer(pointer, key, self.settings.vertical, labels[key], self);
prev = values[key-1];
prevValue = prev ? parseInt(prev, 10 ) : undefined;
@@ -121,51 +126,48 @@
/* test = self.isAsc ? value < self.settings.from : value > self.settings.from,
value1 = test ? self.settings.from : value; */
- test = self.isAsc ? value > self.settings.to : value < self.settings.to;
+ test = self.isAsc ? value > self.settings.to : value < self.settings.to;
value1 = test ? self.settings.to : value;
self.o.pointers[key].set( value1, true );
-
+
// reinit position d
offset = utils.offset(self.o.pointers[key].ptr);
self.o.pointers[key].d = {
left: offset.left,
top: offset.top
- };
- }
+ };
+ }
});
self.domNode.bind('mousedown', self.clickHandler.apply(self));
- this.o.value = angElt(this.domNode.find("i")[2]);
+ this.o.value = angElt(this.domNode.find("i")[2]);
this.is.init = true;
// CSS SKIN
- if (this.settings.css) {
+ if (this.settings.css) {
indicatorLeft.css(this.settings.css.background ? this.settings.css.background : {});
indicatorRight.css(this.settings.css.background ? this.settings.css.background : {});
if (!this.o.pointers[1]) {
- indicator1.css(this.settings.css.before ? this.settings.css.before : {});
+ indicator1.css(this.settings.css.before ? this.settings.css.before : {});
indicator4.css(this.settings.css.after ? this.settings.css.after : {});
}
- indicator2.css(this.settings.css.default ? this.settings.css.default : {});
+ indicator2.css(this.settings.css.default ? this.settings.css.default : {});
indicator3.css(this.settings.css.default ? this.settings.css.default : {});
-
+
range.css(this.settings.css.range ? this.settings.css.range : {});
pointer1.css(this.settings.css.pointer ? this.settings.css.pointer : {});
pointer2.css(this.settings.css.pointer ? this.settings.css.pointer : {});
- }
-
- angForEach(this.o.pointers, function(pointer, key){
- self.redraw(pointer);
- });
-
+ }
+
+ this.redrawPointers();
};
Slider.prototype.clickHandler = function() {
- var self = this;
+ var self = this;
// in case of showing/hiding
var resetPtrSize = function( ptr ) {
@@ -191,51 +193,51 @@
return function(evt) {
if (self.disabled)
- return;
+ return;
var vertical = self.settings.vertical,
targetIdx = 0,
_off = utils.offset(self.domNode),
firstPtr = self.o.pointers[0],
secondPtr = self.o.pointers[1] ? self.o.pointers[1] : null,
- tmpPtr,
+ tmpPtr,
evtPosition = evt.originalEvent ? evt.originalEvent: evt,
- mouse = vertical ? evtPosition.pageY : evtPosition.pageX,
+ mouse = vertical ? evtPosition.pageY : evtPosition.pageX,
css = vertical ? 'top' : 'left',
offset = { left: _off.left, top: _off.top, width: self.domNode[0].clientWidth, height: self.domNode[0].clientHeight },
targetPtr = self.o.pointers[targetIdx];
-
+
if (secondPtr) {
if (!secondPtr.d.width) {
resetPtrSize();
- }
+ }
var firstPtrPosition = utils.offset(firstPtr.ptr)[css];
var secondPtrPosition = utils.offset(secondPtr.ptr)[css];
- var middleGap = Math.abs((secondPtrPosition - firstPtrPosition) / 2);
+ var middleGap = Math.abs((secondPtrPosition - firstPtrPosition) / 2);
var testSecondPtrToMove = mouse >= secondPtrPosition || mouse >= (secondPtrPosition - middleGap);
if (testSecondPtrToMove) {
targetPtr = secondPtr;
}
}
targetPtr._parent = {offset: offset, width: offset.width, height: offset.height};
- var coords = firstPtr._getPageCoords( evt );
+ var coords = firstPtr._getPageCoords( evt );
targetPtr.cx = coords.x - targetPtr.d.left;
- targetPtr.cy = coords.y - targetPtr.d.top;
+ targetPtr.cy = coords.y - targetPtr.d.top;
targetPtr.onmousemove( evt, coords.x, coords.y);
- targetPtr.onmouseup();
+ targetPtr.onmouseup();
angular.extend(targetPtr.d, {
left: coords.x,
- top: coords.y
- });
-
+ top: coords.y
+ });
+
self.redraw(targetPtr);
return false;
};
};
- Slider.prototype.disable = function( bool ) {
+ Slider.prototype.disable = function( bool ) {
this.disabled = bool;
- };
+ };
Slider.prototype.nice = function( value ){
return value;
@@ -260,7 +262,7 @@
if(x > 100) x = 100;
return Math.round(x*10) / 10;
- };
+ };
Slider.prototype.getPointers = function(){
return this.o.pointers;
@@ -278,12 +280,12 @@
position = this.settings.vertical ? 'top' : 'left',
i=0;
for(; i < s.length; i++) {
- if (!s[i].val) {
+ if (!angular.isDefined(s[i].val)) {
prc = (100/(s.length-1)).toFixed(2);
str += '<span style="'+ position + ': ' + i*prc + '%">' + ( s[i] != '|' ? '<ins>' + s[i] + '</ins>' : '' ) + '</span>';
}
- if (s[i].val <= this.settings.to && s[i].val >= this.settings.from && ! duplicate[s[i].val]) {
+ if (s[i].val <= this.settings.to && s[i].val >= this.settings.from && ! duplicate[s[i].val]) {
duplicate[s[i].val] = true;
prc = this.valueToPrc(s[i].val);
label = s[i].label ? s[i].label : s[i].val;
@@ -310,23 +312,28 @@
}
};
- angular.forEach(this.o.pointers, function(ptr, key) {
- self.redraw(ptr);
- });
+ this.redrawPointers();
};
Slider.prototype.update = function(){
this.onresize();
this.drawScale();
- };
+ };
Slider.prototype.drawScale = function( scaleDiv ){
angular.forEach(angular.element(scaleDiv).find('ins'), function(scaleLabel, key) {
scaleLabel.style.marginLeft = - scaleLabel.clientWidth / 2;
});
- };
+ };
+
+ Slider.prototype.redrawPointers = function() {
+
+ angular.forEach(this.o.pointers, function(pointer){
+ this.redraw(pointer);
+ }, this);
+ };
- Slider.prototype.redraw = function( pointer ){
+ Slider.prototype.redraw = function( pointer ){
if(!this.is.init) {
// this.settings.single
if(this.o.pointers[0] && !this.o.pointers[1]) {
@@ -348,13 +355,13 @@
var newPos,
newWidth;
- // redraw range line
+ // redraw range line
if(this.o.pointers[0] && this.o.pointers[1]) {
- newPos = !this.settings.vertical ?
+ newPos = !this.settings.vertical ?
{ left: this.o.pointers[0].value.prc + "%", width: ( this.o.pointers[1].value.prc - this.o.pointers[0].value.prc ) + "%" }
:
{ top: this.o.pointers[0].value.prc + "%", height: ( this.o.pointers[1].value.prc - this.o.pointers[0].value.prc ) + "%" };
-
+
this.o.value.css(newPos);
// both pointer overlap on limits
@@ -363,7 +370,7 @@
}
}
-
+
if(this.o.pointers[0] && !this.o.pointers[1]) {
newWidth = this.o.pointers[0].value.prc - this.originValue;
if (newWidth >= 0) {
@@ -378,9 +385,9 @@
}
else {
this.o.indicators[0].css(!this.settings.vertical ? {width: this.originValue + "%"} : {height: this.originValue + "%"});
- }
+ }
- }
+ }
var value = this.nice(pointer.value.origin);
if (this.settings.modelLabels) {
@@ -391,8 +398,8 @@
value = this.settings.modelLabels[value] !== undefined ? this.settings.modelLabels[value] : value;
}
}
-
- this.o.labels[pointer.uid].value.html(value);
+
+ this.o.labels[pointer.uid].value.html(value);
// redraw position of labels
this.redrawLabels( pointer );
@@ -415,10 +422,10 @@
sizes.margin = 0;
sizes.right = true;
} else
- sizes.right = false;
- }
+ sizes.right = false;
+ }
- if (!self.settings.vertical)
+ if (!self.settings.vertical)
label.o.css({ left: prc + "%", marginLeft: sizes.margin+"px", right: "auto" });
else
label.o.css({ top: prc + "%", marginLeft: "20px", marginTop: sizes.margin, bottom: "auto" });
@@ -436,9 +443,9 @@
prc = pointer.value.prc,
// case hidden
labelWidthSize = label.o[0].offsetWidth === 0 ? (label.o[0].textContent.length)*7 : label.o[0].offsetWidth;
-
+
this.sizes.domWidth = this.domNode[0].clientWidth;
- this.sizes.domHeight = this.domNode[0].clientHeight;
+ this.sizes.domHeight = this.domNode[0].clientHeight;
var sizes = {
label: !self.settings.vertical ? labelWidthSize : label.o[0].offsetHeight,
@@ -448,12 +455,12 @@
var anotherIdx = pointer.uid === 0 ? 1:0,
anotherLabel,
- anotherPtr;
+ anotherPtr;
if (!this.settings.single && !this.settings.vertical){
- // glue if near;
+ // glue if near;
anotherLabel = this.o.labels[anotherIdx];
- anotherPtr = this.o.pointers[anotherIdx];
+ anotherPtr = this.o.pointers[anotherIdx];
var label1 = this.o.labels[0],
label2 = this.o.labels[1],
ptr1 = this.o.pointers[0],
@@ -465,27 +472,27 @@
label2.o.css(this.css.visible);
value = this.getLabelValue(value);
-
+
if (gapBetweenLabel + 10 < label1.o[0].offsetWidth+label2.o[0].offsetWidth) {
anotherLabel.o.css(this.css.hidden);
-
+
anotherLabel.value.html(value);
prc = (anotherPtr.value.prc - prc) / 2 + prc;
if(anotherPtr.value.prc != pointer.value.prc){
value = this.nice(this.o.pointers[0].value.origin);
var value1 = this.nice(this.o.pointers[1].value.origin);
value = this.getLabelValue(value);
- value1 = this.getLabelValue(value1);
-
+ value1 = this.getLabelValue(value1);
+
label.value.html(value + "&nbsp;&ndash;&nbsp;" + value1);
sizes.label = label.o[0].offsetWidth;
sizes.border = (prc * domSize) / 100;
}
}
- else {
+ else {
anotherLabel.value.html(value);
anotherLabel.o.css(this.css.visible);
- }
+ }
}
sizes = setPosition(label, sizes, prc);
@@ -503,9 +510,9 @@
};
sizes = setPosition(anotherLabel, sizes2, anotherPtr.value.prc);
}
-
+
this.redrawLimits();
- };
+ };
Slider.prototype.redrawLimits = function() {
if (this.settings.limits) {
@@ -528,19 +535,19 @@
limit = this.o.limits[1];
if(label_left + label.o[0].clientWidth > this.sizes.domWidth - limit[0].clientWidth){
- limits[1] = false;
+ limits[1] = false;
}
-
+
}
}
for(; i < limits.length; i++){
if(limits[i]){ // TODO animate
- angular.element(this.o.limits[i]).addClass("animate-show");
+ angular.element(this.o.limits[i]).addClass("animate-show");
}
else{
angular.element(this.o.limits[i]).addClass("animate-hidde");
- }
+ }
}
}
};
@@ -557,7 +564,7 @@
var value = "";
angular.forEach(this.o.pointers, function(pointer, key){
- if(pointer.value.prc !== undefined && !isNaN(pointer.value.prc))
+ if(pointer.value.prc !== undefined && !isNaN(pointer.value.prc))
value += (key > 0 ? ";" : "") + $this.prcToValue(pointer.value.prc);
});
return value;
@@ -565,14 +572,14 @@
Slider.prototype.getLabelValue = function(value){
if (this.settings.modelLabels) {
- if (angular.isFunction(this.settings.modelLabels)) {
+ if (angular.isFunction(this.settings.modelLabels)) {
return this.settings.modelLabels(value);
}
else {
return this.settings.modelLabels[value] !== undefined ? this.settings.modelLabels[value] : value;
}
- }
-
+ }
+
return value;
};
@@ -590,7 +597,7 @@
Slider.prototype.prcToValue = function( prc ){
var value;
- if (this.settings.heterogeneity && this.settings.heterogeneity.length > 0){
+ if (this.settings.heterogeneity && this.settings.heterogeneity.length > 0){
var h = this.settings.heterogeneity,
_start = 0,
_from = this.settings.round ? parseFloat(this.settings.from) : parseInt(this.settings.from, 10),
@@ -599,7 +606,7 @@
for (; i <= h.length; i++){
var v;
- if(h[i])
+ if(h[i])
v = h[i].split('/');
else
v = [100, _to];
@@ -614,10 +621,10 @@
_start = v1;
_from = v2;
}
- }
+ }
else {
value = this.settings.from + (prc * this.settings.interval) / 100;
- }
+ }
return this.round(value);
};
@@ -625,10 +632,10 @@
Slider.prototype.valueToPrc = function( value, pointer ){
var prc,
_from = this.settings.round ? parseFloat(this.settings.from) : parseInt(this.settings.from, 10);
-
+
if (this.settings.heterogeneity && this.settings.heterogeneity.length > 0){
var h = this.settings.heterogeneity,
- _start = 0,
+ _start = 0,
i = 0;
for (; i <= h.length; i++) {
@@ -636,7 +643,7 @@
if(h[i])
v = h[i].split('/');
else
- v = [100, this.settings.to];
+ v = [100, this.settings.to];
var v1 = this.settings.round ? parseFloat(v[0]) : parseInt(v[0], 10);
var v2 = this.settings.round ? parseFloat(v[1]) : parseInt(v[1], 10);
@@ -666,14 +673,14 @@
Slider.prototype.round = function( value ){
value = Math.round(value / this.settings.step) * this.settings.step;
- if(this.settings.round)
+ if(this.settings.round)
value = Math.round(value * Math.pow(10, this.settings.round)) / Math.pow(10, this.settings.round);
- else
+ else
value = Math.round(value);
- return value;
+ return value;
};
return Slider;
}]);
-}(angular)); \ No newline at end of file
+}(angular));