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

Renames invoked response to returnedValue for clarity, fixes issue when non string values are returned in array

pull/2229/head
jlukic 11 years ago
parent
11153b04e1
commit
032871e045
18 changed files with 169 additions and 149 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/modules/accordion.js
  2. 16
      src/modules/behavior/api.js
  3. 16
      src/modules/behavior/form.js
  4. 16
      src/modules/behavior/state.js
  5. 4
      src/modules/chatroom.js
  6. 26
      src/modules/checkbox.js
  7. 16
      src/modules/dimmer.js
  8. 20
      src/modules/dropdown.js
  9. 16
      src/modules/modal.js
  10. 16
      src/modules/nag.js
  11. 44
      src/modules/popup.js
  12. 16
      src/modules/rating.js
  13. 16
      src/modules/search.js
  14. 16
      src/modules/shape.js
  15. 16
      src/modules/sidebar.js
  16. 16
      src/modules/tab.js
  17. 16
      src/modules/transition.js
  18. 16
      src/modules/video.js

16
src/modules/accordion.js
View File

@ -21,7 +21,7 @@ $.fn.accordion = function(parameters) {
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$allModules
.each(function() {
@ -348,14 +348,14 @@ $.fn.accordion = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -374,8 +374,8 @@ $.fn.accordion = function(parameters) {
}
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/behavior/api.js
View File

@ -47,7 +47,7 @@
queryArguments = [].slice.call(arguments, 1),
module,
invokedResponse
returnedValue
;
module = {
@ -494,14 +494,14 @@
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -520,8 +520,8 @@
module.initialize();
}
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/behavior/form.js
View File

@ -35,7 +35,7 @@ $.fn.form = function(fields, parameters) {
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$allModules
.each(function() {
@ -532,14 +532,14 @@ $.fn.form = function(fields, parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -560,8 +560,8 @@ $.fn.form = function(fields, parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/behavior/state.js
View File

@ -37,7 +37,7 @@ $.fn.state = function(parameters) {
moduleNamespace = namespace + '-module',
invokedResponse
returnedValue
;
$allModules
.each(function() {
@ -582,14 +582,14 @@ $.fn.state = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -610,8 +610,8 @@ $.fn.state = function(parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

4
src/modules/chatroom.js
View File

@ -585,8 +585,8 @@ $.fn.chatroom = function(parameters) {
})
;
return (invokedResponse)
? invokedResponse
return (returnedValue)
? returnedValue
: this
;
};

26
src/modules/checkbox.js
View File

@ -22,7 +22,7 @@ $.fn.checkbox = function(parameters) {
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$allModules
@ -90,6 +90,12 @@ $.fn.checkbox = function(parameters) {
is: {
radio: function() {
return $module.hasClass(className.radio);
},
enabled: function() {
return $input.prop('checked') !== undefined && $input.prop('checked');
},
disabled: function() {
return !module.is.enabled();
}
},
@ -122,10 +128,10 @@ $.fn.checkbox = function(parameters) {
toggle: function(event) {
module.verbose('Determining new checkbox state');
if($input.prop('checked') === undefined || !$input.prop('checked')) {
if( module.is.disabled() ) {
module.enable();
}
else if( module.can.disable() ) {
else if( module.is.enabled() && module.can.disable() ) {
module.disable();
}
},
@ -274,14 +280,14 @@ $.fn.checkbox = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -302,8 +308,8 @@ $.fn.checkbox = function(parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/dimmer.js
View File

@ -22,7 +22,7 @@ $.fn.dimmer = function(parameters) {
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$allModules
@ -479,14 +479,14 @@ $.fn.dimmer = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -509,8 +509,8 @@ $.fn.dimmer = function(parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

20
src/modules/dropdown.js
View File

@ -24,7 +24,7 @@ $.fn.dropdown = function(parameters) {
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$allModules
@ -240,7 +240,7 @@ $.fn.dropdown = function(parameters) {
settings.action(text, value);
}
else {
module.error(error.action);
module.error(error.action, settings.action);
}
},
intent: function(event, callback) {
@ -457,7 +457,7 @@ $.fn.dropdown = function(parameters) {
;
}
else {
module.error(error.transition);
module.error(error.transition, settings.transition);
}
}
},
@ -718,14 +718,14 @@ $.fn.dropdown = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -746,8 +746,8 @@ $.fn.dropdown = function(parameters) {
})
;
return (invokedResponse)
? invokedResponse
return (returnedValue)
? returnedValue
: this
;
};

16
src/modules/modal.js
View File

@ -24,7 +24,7 @@ $.fn.modal = function(parameters) {
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
@ -520,14 +520,14 @@ $.fn.modal = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -548,8 +548,8 @@ $.fn.modal = function(parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/nag.js
View File

@ -22,7 +22,7 @@ $.fn.nag = function(parameters) {
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$(this)
.each(function() {
@ -448,14 +448,14 @@ $.fn.nag = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -475,8 +475,8 @@ $.fn.nag = function(parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

44
src/modules/popup.js
View File

@ -26,7 +26,7 @@ $.fn.popup = function(parameters) {
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$allModules
.each(function() {
@ -196,7 +196,8 @@ $.fn.popup = function(parameters) {
}
},
show: function() {
show: function(callback) {
callback = callback || function(){};
module.debug('Showing pop-up', settings.transition);
if( !module.exists() ) {
module.create();
@ -207,20 +208,27 @@ $.fn.popup = function(parameters) {
;
if(settings.transition && $.fn.transition !== undefined) {
$popup
.transition(settings.transition + ' in', settings.duration, module.bind.close)
.transition(settings.transition + ' in', settings.duration, function() {
module.bind.close();
$.proxy(callback, element)();
})
;
}
else {
$popup
.stop()
.fadeIn(settings.duration, settings.easing, module.bind.close)
.fadeIn(settings.duration, settings.easing, function() {
module.bind.close();
$.proxy(callback, element)();
})
;
}
$.proxy(settings.onShow, $popup)();
},
hide: function() {
hide: function(callback) {
callback = callback || function(){};
$module
.removeClass(className.visible)
;
@ -229,13 +237,19 @@ $.fn.popup = function(parameters) {
module.debug('Hiding pop-up');
if(settings.transition && $.fn.transition !== undefined) {
$popup
.transition(settings.transition + ' out', settings.duration, module.reset)
.transition(settings.transition + ' out', settings.duration, function() {
module.reset();
callback();
})
;
}
else {
$popup
.stop()
.fadeOut(settings.duration, settings.easing, module.reset)
.fadeOut(settings.duration, settings.easing, function() {
module.reset();
callback();
})
;
}
}
@ -668,7 +682,7 @@ $.fn.popup = function(parameters) {
return false;
}
else {
module.error(error.method);
module.error(error.method, query);
return false;
}
});
@ -679,14 +693,14 @@ $.fn.popup = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -707,8 +721,8 @@ $.fn.popup = function(parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/rating.js
View File

@ -22,7 +22,7 @@ $.fn.rating = function(parameters) {
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$allModules
.each(function() {
@ -339,14 +339,14 @@ $.fn.rating = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -366,8 +366,8 @@ $.fn.rating = function(parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/search.js
View File

@ -22,7 +22,7 @@ $.fn.search = function(source, parameters) {
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$(this)
.each(function() {
@ -554,14 +554,14 @@ $.fn.search = function(source, parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -582,8 +582,8 @@ $.fn.search = function(source, parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/shape.js
View File

@ -21,7 +21,7 @@ $.fn.shape = function(parameters) {
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$allModules
@ -690,14 +690,14 @@ $.fn.shape = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -718,8 +718,8 @@ $.fn.shape = function(parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/sidebar.js
View File

@ -22,7 +22,7 @@ $.fn.sidebar = function(parameters) {
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$allModules
@ -419,14 +419,14 @@ $.fn.sidebar = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -446,8 +446,8 @@ $.fn.sidebar = function(parameters) {
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/tab.js
View File

@ -47,7 +47,7 @@
queryArguments = [].slice.call(arguments, 1),
module,
invokedResponse
returnedValue
;
module = {
@ -607,14 +607,14 @@
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -633,8 +633,8 @@
module.initialize();
}
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;

16
src/modules/transition.js
View File

@ -30,7 +30,7 @@ $.fn.transition = function() {
|| window.msRequestAnimationFrame
|| function(callback) { setTimeout(callback, 0); },
invokedResponse
returnedValue
;
$allModules
.each(function() {
@ -582,14 +582,14 @@ $.fn.transition = function() {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found || false;
}
@ -597,8 +597,8 @@ $.fn.transition = function() {
module.initialize();
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

16
src/modules/video.js
View File

@ -24,7 +24,7 @@ $.fn.video = function(parameters) {
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
invokedResponse
returnedValue
;
$allModules
@ -378,14 +378,14 @@ $.fn.video = function(parameters) {
else if(found !== undefined) {
response = found;
}
if($.isArray(invokedResponse)) {
invokedResponse.push(response);
if($.isArray(returnedValue)) {
returnedValue.push(response);
}
else if(typeof invokedResponse == 'string') {
invokedResponse = [invokedResponse, response];
else if(returnedValue !== undefined) {
returnedValue = [returnedValue, response];
}
else if(response !== undefined) {
invokedResponse = response;
returnedValue = response;
}
return found;
}
@ -405,8 +405,8 @@ $.fn.video = function(parameters) {
}
})
;
return (invokedResponse !== undefined)
? invokedResponse
return (returnedValue !== undefined)
? returnedValue
: this
;
};

Write Preview
Loading…
Cancel
Save