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

Fixes issue with module pattern setting/internal method

pull/2229/head
jlukic 11 years ago
parent
786d3034f5
commit
72e2226265
14 changed files with 142 additions and 189 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/modules/accordion.js
  2. 24
      src/modules/behavior/api.js
  3. 26
      src/modules/behavior/form.js
  4. 28
      src/modules/chatroom.js
  5. 24
      src/modules/checkbox.js
  6. 26
      src/modules/dropdown.js
  7. 13
      src/modules/nag.js
  8. 24
      src/modules/rating.js
  9. 26
      src/modules/search.js
  10. 24
      src/modules/shape.js
  11. 24
      src/modules/sidebar.js
  12. 24
      src/modules/tab.js
  13. 31
      src/modules/transition.js
  14. 24
      src/modules/video.js

13
src/modules/accordion.js
View File

@ -202,14 +202,11 @@ $.fn.accordion = function(parameters) {
},
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];

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

@ -350,26 +350,22 @@
},
setting: function(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) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];

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

@ -383,28 +383,22 @@ $.fn.form = function(fields, parameters) {
},
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) {
module.debug('Changing internal', name, value);
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];

28
src/modules/chatroom.js
View File

@ -13,8 +13,16 @@
$.fn.chatroom = function(parameters) {
var
// hoist arguments
moduleArguments = arguments || false
$allModules = $(this),
moduleSelector = $allModules.selector || '',
time = new Date().getTime(),
performance = [],
query = arguments[0],
methodInvoked = (typeof query == 'string'),
queryArguments = [].slice.call(arguments, 1),
returnedValue
;
$(this)
.each(function() {
@ -42,6 +50,7 @@ $.fn.chatroom = function(parameters) {
$messageButton = $module.find(selector.messageButton),
instance = $module.data('module'),
element = this,
html = '',
users = {},
@ -435,8 +444,6 @@ $.fn.chatroom = function(parameters) {
},
setting: function(name, value) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
@ -451,13 +458,11 @@ $.fn.chatroom = function(parameters) {
}
},
internal: function(name, value) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];
@ -525,7 +530,6 @@ $.fn.chatroom = function(parameters) {
if(moduleSelector) {
title += ' \'' + moduleSelector + '\'';
}
title += ' ' + '(' + $allDropdowns.size() + ')';
if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) {
console.groupCollapsed(title);
if(console.table) {

24
src/modules/checkbox.js
View File

@ -136,26 +136,22 @@ $.fn.checkbox = function(parameters) {
}
},
setting: function(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) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];

26
src/modules/dropdown.js
View File

@ -63,10 +63,10 @@ $.fn.dropdown = function(parameters) {
module.set.selected();
// no use detecting mouse events because touch devices emulate them
if(hasTouch) {
module.bind.touchEvents();
}
// no use detecting mouse events because touch devices emulate them
module.bind.mouseEvents();
module.instantiate();
},
@ -573,26 +573,22 @@ $.fn.dropdown = function(parameters) {
},
setting: function(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) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];

13
src/modules/nag.js
View File

@ -299,14 +299,11 @@ $.fn.nag = function(parameters) {
}
},
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];

24
src/modules/rating.js
View File

@ -192,26 +192,22 @@ $.fn.rating = function(parameters) {
},
setting: function(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) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];

26
src/modules/search.js
View File

@ -405,28 +405,22 @@ $.fn.search = function(source, parameters) {
},
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) {
module.debug('Changing internal', name, value);
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];

24
src/modules/shape.js
View File

@ -543,26 +543,22 @@ $.fn.shape = function(parameters) {
}
},
setting: function(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) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];

24
src/modules/sidebar.js
View File

@ -272,26 +272,22 @@ $.fn.sidebar = function(parameters) {
},
setting: function(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) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];

24
src/modules/tab.js
View File

@ -463,26 +463,22 @@
},
setting: function(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) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];

31
src/modules/transition.js
View File

@ -106,7 +106,6 @@ $.fn.transition = function() {
if(settings.queue) {
module.queue(settings.animation);
}
return false;
}
module.save.conditions();
module.set.duration(settings.duration);
@ -146,10 +145,12 @@ $.fn.transition = function() {
if($module.hasClass(className.outward)) {
module.restore.conditions();
module.hide();
$.proxy(settings.onHide, this)();
}
else if($module.hasClass(className.inward)) {
module.restore.conditions();
module.show();
$.proxy(settings.onShow, this)();
}
else {
module.restore.conditions();
@ -436,26 +437,22 @@ $.fn.transition = function() {
},
setting: function(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) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];
@ -622,12 +619,14 @@ $.fn.transition.settings = {
// animation complete event
complete : function() {},
onShow : function() {},
onHide : function() {},
// animation duration
animation : 'fade',
duration : '700ms',
// queue up animations
// new animations will occur after previous ones
queue : true,
className : {

24
src/modules/video.js
View File

@ -231,26 +231,22 @@ $.fn.video = function(parameters) {
},
setting: function(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) {
if(value !== undefined) {
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else {
module[name] = value;
}
if( $.isPlainObject(name) ) {
$.extend(true, module, name);
}
else if(value !== undefined) {
module[name] = value;
}
else {
return module[name];

Write Preview
Loading…
Cancel
Save