clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eliminate Cropper conflicts with jQuery

Browse Source
This commit is contained in:
Zach Prezkuta
2013-06-01 10:42:51 -06:00
parent 032cb5f6a3
commit 127b7a589e
72 changed files with 1659 additions and 1817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/cropper/lib/slider.js
View File

@@ -35,12 +35,12 @@ Control.Slider.prototype = {
var slider = this;
if(handle instanceof Array) {
this.handles = handle.collect( function(e) { return $(e) });
this.handles = handle.collect( function(e) { return $PR(e) });
} else {
this.handles = [$(handle)];
this.handles = [$PR(handle)];
}
this.track = $(track);
this.track = $PR(track);
this.options = options || {};
this.axis = this.options.axis || 'horizontal';
@@ -50,9 +50,9 @@ Control.Slider.prototype = {
this.value = 0; // assure backwards compat
this.values = this.handles.map( function() { return 0 });
this.spans = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
this.options.startSpan = $(this.options.startSpan || null);
this.options.endSpan = $(this.options.endSpan || null);
this.spans = this.options.spans ? this.options.spans.map(function(s){ return $PR(s) }) : false;
this.options.startSpan = $PR(this.options.startSpan || null);
this.options.endSpan = $PR(this.options.endSpan || null);
this.restricted = this.options.restricted || false;
@@ -280,4 +280,4 @@ Control.Slider.prototype = {
this.options.onChange(this.values.length>1 ? this.values : this.value, this);
this.event = null;
}
}
}