vendor/assets/javascripts/semantic-ui/modules/nag.js in semantic-ui-rails-0.6.5 vs vendor/assets/javascripts/semantic-ui/modules/nag.js in semantic-ui-rails-0.7.2
- old
+ new
@@ -20,11 +20,11 @@
performance = [],
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
- invokedResponse
+ returnedValue
;
$(this)
.each(function() {
var
settings = $.extend(true, {}, $.fn.nag.settings, parameters),
@@ -297,19 +297,16 @@
}
}, settings.lag);
}
},
setting: function(name, value) {
- module.debug('Changing setting', name, value);
- if(value !== undefined) {
- if( $.isPlainObject(name) ) {
- $.extend(true, settings, name);
- }
- else {
- settings[name] = value;
- }
+ if( $.isPlainObject(name) ) {
+ $.extend(true, settings, name);
}
+ else if(value !== undefined) {
+ settings[name] = value;
+ }
else {
return settings[name];
}
},
internal: function(name, value) {
@@ -446,18 +443,18 @@
response = found.apply(context, passedArguments);
}
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;
}
};
if(methodInvoked) {
@@ -473,11 +470,11 @@
module.initialize();
}
})
;
- return (invokedResponse !== undefined)
- ? invokedResponse
+ return (returnedValue !== undefined)
+ ? returnedValue
: this
;
};
$.fn.nag.settings = {