richard
/
SemanSemantic-UItic-UI
mirror of https://github.com/Semantic-Org/Semantic-UI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Hopfully fixed formatting issues. Updated hover to be for the whole component. Added namespace to event listeners that I forgot to add it to.

pull/4212/head
Gareth Daunton 8 years ago
parent
c71bdc8beb
commit
3e61750fd2
2 changed files with 101 additions and 100 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 199
      src/definitions/modules/range.js
  2. 2
      src/definitions/modules/range.less

199
src/definitions/modules/range.js
View File

@ -16,58 +16,58 @@ window = (typeof window != 'undefined' && window.Math == Math)
$.fn.range = function(parameters) {
var
$allModules = $(this),
var
$allModules = $(this),
moduleSelector = $allModules.selector || '',
time = new Date().getTime(),
performance = [],
query = arguments[0],
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
returnedValue
;
;
$allModules
.each(function() {
var
settings = ( $.isPlainObject(parameters) )
? $.extend(true, {}, $.fn.range.settings, parameters)
: $.extend({}, $.fn.range.settings),
var
settings = ( $.isPlainObject(parameters) )
? $.extend(true, {}, $.fn.range.settings, parameters)
: $.extend({}, $.fn.range.settings),
className = settings.className,
metadata = settings.metadata,
namespace = settings.namespace,
start = settings.start,
input = settings.input,
namespace = settings.namespace,
start = settings.start,
input = settings.input,
error = settings.error,
eventNamespace = '.' + namespace,
moduleNamespace = 'module-' + namespace,
eventNamespace = '.' + namespace,
moduleNamespace = 'module-' + namespace,
$module = $(this),
$module = $(this),
$thumb,
$track,
$trackFill,
element = this,
instance = $module.data(moduleNamespace),
element = this,
instance = $module.data(moduleNamespace),
reversed = $module.hasClass(settings.className.reversed),
offset,
precision,
precision,
isTouch,
module
;
module
;
module = {
module = {
initialize: function() {
initialize: function() {
module.debug('Initializing range slider', settings);
isTouch = module.get.isTouch();
module.setup.layout();
@ -75,16 +75,16 @@ $.fn.range = function(parameters) {
module.bind.events();
module.read.metadata();
module.read.settings();
module.instantiate();
},
module.instantiate();
},
instantiate: function() {
instantiate: function() {
module.verbose('Storing instance of range', module);
instance = module;
$module
instance = module;
$module
.data(moduleNamespace, module)
;
},
},
destroy: function() {
module.verbose('Destroying previous range for', $module);
@ -109,59 +109,61 @@ $.fn.range = function(parameters) {
bind: {
events: function() {
// event listeners
$module.find('.track, .thumb, .inner').on('mousedown', function(event) {
event.stopImmediatePropagation();
event.preventDefault();
$(this).closest(".range").trigger('mousedown', event);
module.event.down(event);
});
$module.find('.track, .thumb, .inner').on('touchstart', function(event) {
event.stopImmediatePropagation();
event.preventDefault();
$(this).closest(".range").trigger('touchstart', event);
$module.find('.track, .thumb, .inner').on('mousedown' + eventNamespace, function(event) {
event.stopImmediatePropagation();
event.preventDefault();
$(this).closest(".range").trigger('mousedown' + eventNamespace, event);
module.event.down(event);
});
$module.on('mousedown' + eventNamespace, module.event.down);
$module.on('touchstart' + eventNamespace, module.event.down);
});
$module.on('mousedown' + eventNamespace, module.event.down);
if(module.get.isTouch()) {
$module.find('.track, .thumb, .inner').on('touchstart' + eventNamespace, function(event) {
event.stopImmediatePropagation();
event.preventDefault();
$(this).closest(".range").trigger('touchstart' + eventNamespace, event);
module.event.down(event);
});
$module.on('touchstart' + eventNamespace, module.event.down);
}
},
documentEvents: function() {
if(module.get.isTouch()) {
$(document).on('touchmove' + eventNamespace, module.event.move);
$(document).on('touchend' + eventNamespace, module.event.up);
}
else {
$(document).on('mousemove' + eventNamespace, module.event.move);
$(document).on('mouseup' + eventNamespace, module.event.up);
}
$(document).on('touchmove' + eventNamespace, module.event.move);
$(document).on('touchend' + eventNamespace, module.event.up);
}
else {
$(document).on('mousemove' + eventNamespace, module.event.move);
$(document).on('mouseup' + eventNamespace, module.event.up);
}
}
},
unbind: {
events: function() {
$module.find('.track, .thumb, .inner').off('mousedown', function(event) {
event.stopImmediatePropagation();
event.preventDefault();
$(this).closest(".range").trigger('mousedown', event);
$module.find('.track, .thumb, .inner').off('mousedown' + eventNamespace, function(event) {
event.stopImmediatePropagation();
event.preventDefault();
$(this).closest(".range").trigger('mousedown' + eventNamespace, event);
module.event.mousedown(event);
});
$module.find('.track, .thumb, .inner').off('touchstart', function(event) {
event.stopImmediatePropagation();
event.preventDefault();
$(this).closest(".range").trigger('touchstart', event);
});
$module.find('.track, .thumb, .inner').off('touchstart' + eventNamespace, function(event) {
event.stopImmediatePropagation();
event.preventDefault();
$(this).closest(".range").trigger('touchstart' + eventNamespace, event);
module.event.touchstart(event);
});
$module.off('mousedown' + eventNamespace, module.event.down);
$module.off('touchstart' + eventNamespace, module.event.down);
});
$module.off('mousedown' + eventNamespace, module.event.down);
$module.off('touchstart' + eventNamespace, module.event.down);
},
documentEvents: function() {
if(module.get.isTouch()) {
$(document).off('touchmove' + eventNamespace, module.event.move);
$(document).off('touchend' + eventNamespace, module.event.up);
}
else {
$(document).off('mousemove' + eventNamespace, module.event.move);
$(document).off('mouseup' + eventNamespace, module.event.up);
}
$(document).off('touchmove' + eventNamespace, module.event.move);
$(document).off('touchend' + eventNamespace, module.event.up);
}
else {
$(document).off('mousemove' + eventNamespace, module.event.move);
$(document).off('mouseup' + eventNamespace, module.event.up);
}
},
},
@ -231,17 +233,17 @@ $.fn.range = function(parameters) {
;
if(step != 0) {
var split = String(step).split('.');
if(split.length == 2) {
decimalPlaces = split[1].length;
} else {
decimalPlaces = 0;
}
if(split.length == 2) {
decimalPlaces = split[1].length;
} else {
decimalPlaces = 0;
}
} else {
decimalPlaces = settings.decimalPlaces;
}
var precision = Math.pow(10, decimalPlaces);
module.debug('Precision determined', precision);
return precision;
return precision;
},
min: function() {
return module.min || settings.min;
@ -259,22 +261,22 @@ $.fn.range = function(parameters) {
return reversed ? module.get.trackStartPos() - pagePos + module.get.trackOffset() : pagePos - module.get.trackOffset() - module.get.trackStartPos();
},
value: function(position) {
var
var
startPos = reversed ? module.get.trackEndPos() : module.get.trackStartPos(),
endPos = reversed ? module.get.trackStartPos() : module.get.trackEndPos(),
ratio = (position - startPos) / (endPos - startPos),
range = module.get.max() - module.get.min(),
range = module.get.max() - module.get.min(),
step = module.get.step(),
value = (ratio * range),
difference = (step == 0) ? value : Math.round(value / step) * step
difference = (step == 0) ? value : Math.round(value / step) * step
;
module.verbose('Determined value based upon position: ' + position + ' as: ' + value);
if(value != difference) module.verbose('Rounding value to closest step: ' + difference);
// Use precision to avoid ugly Javascript floating point rounding issues
// (like 35 * .01 = 0.35000000000000003)
// Use precision to avoid ugly Javascript floating point rounding issues
// (like 35 * .01 = 0.35000000000000003)
difference = Math.round(difference * precision) / precision;
module.verbose('Cutting ')
return difference - module.get.min();
return difference - module.get.min();
},
positionFromValue: function(value) {
var
@ -295,12 +297,12 @@ $.fn.range = function(parameters) {
set: {
value: function(newValue) {
if(input) {
$(input).val(newValue);
}
settings.onChange.call(element, newValue);
if(input) {
$(input).val(newValue);
}
settings.onChange.call(element, newValue);
module.debug('Setting range value to ' + newValue);
},
},
max: function(value) {
module.max = value;
},
@ -315,11 +317,10 @@ $.fn.range = function(parameters) {
$thumb.css({right: String(value - offset) + 'px'});
else
$thumb.css({left: String(value - offset) + 'px'});
$trackFill.css({width: String(value) + 'px'});
$trackFill.css({width: String(value) + 'px'});
module.position = value;
module.debug('Setting range position to ' + value);
},
positionBasedValue: function(value) {
var
min = module.get.min(),
@ -336,8 +337,7 @@ $.fn.range = function(parameters) {
module.goto.max();
module.set.value(max);
}
},
},
valueMoveToValueBasedPosition: function(position) {
var
value = module.determine.value(position),
@ -354,7 +354,6 @@ $.fn.range = function(parameters) {
module.set.value(value);
module.set.position(pos);
},
valueBasedPosition: function(position) {
var
value = module.determine.value(position),
@ -500,6 +499,7 @@ $.fn.range = function(parameters) {
module.error.apply(console, arguments);
}
},
performance: {
log: function(message) {
var
@ -551,6 +551,7 @@ $.fn.range = function(parameters) {
performance = [];
}
},
invoke: function(query, passedArguments, context) {
var
object = instance,
@ -631,16 +632,16 @@ $.fn.range = function(parameters) {
$.fn.range.settings = {
silent : false,
debug : false,
verbose : false,
performance : true,
silent : false,
debug : false,
verbose : false,
performance : true,
name : 'Range',
namespace : 'range',
error : {
method : 'The method you called is not defined.',
method : 'The method you called is not defined.',
},
metadata: {
@ -650,11 +651,11 @@ $.fn.range.settings = {
step : 'step'
},
min : 0,
max : 20,
step : 1,
start : 0,
input : false,
min : 0,
max : 20,
step : 1,
start : 0,
input : false,
//the decimal place to round to if step is undefined
decimalPlaces : 2,
@ -664,7 +665,7 @@ $.fn.range.settings = {
disabled : 'disabled'
},
onChange : function(value){},
onChange : function(value){},
};

2
src/definitions/modules/range.less
View File

@ -107,7 +107,7 @@
transition: @hoverOpacityTransition;
}
.ui.hover.range .inner:hover .thumb {
.ui.hover.range:hover .inner .thumb {
opacity: @hoverVarHoverOpacity;
}

Write Preview
Loading…
Cancel
Save