From ec8ea4a67a1303cf5004dcf29ae77c3a4bc749ad Mon Sep 17 00:00:00 2001 From: jlukic Date: Sat, 28 Sep 2013 18:39:23 -0400 Subject: [PATCH] updates invoke to never return the function called, adds hide dimmer to modal --- RELEASE NOTES.md | 5 + build/less/modules/chatroom.js | 2 +- build/less/modules/dimmer.js | 1 - build/less/modules/dropdown.js | 8 +- build/less/modules/modal.js | 5 +- build/minified/modules/chatroom.js | 2 +- build/minified/modules/dimmer.js | 1 - build/minified/modules/dropdown.js | 8 +- build/minified/modules/modal.js | 5 +- build/uncompressed/modules/chatroom.js | 2 +- build/uncompressed/modules/dimmer.js | 1 - build/uncompressed/modules/dropdown.js | 8 +- build/uncompressed/modules/modal.js | 5 +- node/src/documents/modules/modal.html.eco | 162 +++++++++++++----- node/src/files/build/less/modules/chatroom.js | 2 +- node/src/files/build/less/modules/dimmer.js | 1 - node/src/files/build/less/modules/dropdown.js | 8 +- node/src/files/build/less/modules/modal.js | 5 +- .../files/build/minified/modules/chatroom.js | 2 +- .../files/build/minified/modules/dimmer.js | 1 - .../files/build/minified/modules/dropdown.js | 8 +- .../src/files/build/minified/modules/modal.js | 5 +- .../build/uncompressed/modules/chatroom.js | 2 +- .../build/uncompressed/modules/dimmer.js | 1 - .../build/uncompressed/modules/dropdown.js | 8 +- .../files/build/uncompressed/modules/modal.js | 5 +- .../src/files/generated/module.commented.html | 2 +- node/src/files/javascript/modal.js | 11 ++ src/modules/chatroom.js | 2 +- src/modules/dimmer.js | 1 - src/modules/dropdown.js | 8 +- src/modules/modal.js | 5 +- 32 files changed, 200 insertions(+), 92 deletions(-) diff --git a/RELEASE NOTES.md b/RELEASE NOTES.md index 26431058e..2c70dba65 100755 --- a/RELEASE NOTES.md +++ b/RELEASE NOTES.md @@ -1,5 +1,10 @@ ## RELEASE NOTES +### Version 0.2.2 - Sep 28, 2013 + +**Updates** +- Fixes invoke returning found function instead of results of found function in dropdown, modal + ### Version 0.2.1 - Sep 28, 2013 **Updates** diff --git a/build/less/modules/chatroom.js b/build/less/modules/chatroom.js index fde496f95..7de7a519e 100644 --- a/build/less/modules/chatroom.js +++ b/build/less/modules/chatroom.js @@ -574,7 +574,7 @@ $.fn.chatroom = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/build/less/modules/dimmer.js b/build/less/modules/dimmer.js index da1ea1e88..8d24f0480 100644 --- a/build/less/modules/dimmer.js +++ b/build/less/modules/dimmer.js @@ -316,7 +316,6 @@ $.fn.dimmer = function(parameters) { }, setting: function(name, value) { - module.debug('Changing setting', name, value); if(value !== undefined) { if( $.isPlainObject(name) ) { $.extend(true, settings, name); diff --git a/build/less/modules/dropdown.js b/build/less/modules/dropdown.js index c31938e68..e27b03abd 100644 --- a/build/less/modules/dropdown.js +++ b/build/less/modules/dropdown.js @@ -161,7 +161,7 @@ $.fn.dropdown = function(parameters) { var $choice = $(this), text = $choice.data(metadata.text) || $choice.text(), - value = $choice.data(metadata.value) || text + value = $choice.data(metadata.value) || text.toLowerCase() ; if( $choice.find(selector.menu).size() === 0 ) { module.verbose('Adding active state to selected item'); @@ -358,7 +358,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'slide down') { $currentMenu @@ -406,7 +406,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'none') { callback(); @@ -639,7 +639,7 @@ $.fn.dropdown = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/build/less/modules/modal.js b/build/less/modules/modal.js index 704aafb3d..5d50b6d77 100644 --- a/build/less/modules/modal.js +++ b/build/less/modules/modal.js @@ -157,6 +157,9 @@ $.fn.modal = function(parameters) { module.set.dimmerSettings(); $context.dimmer('show'); }, + hideDimmer: function() { + $context.dimmer('hide'); + }, hide: function() { module.debug('Hiding modal'); @@ -438,7 +441,7 @@ $.fn.modal = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/build/minified/modules/chatroom.js b/build/minified/modules/chatroom.js index fde496f95..7de7a519e 100644 --- a/build/minified/modules/chatroom.js +++ b/build/minified/modules/chatroom.js @@ -574,7 +574,7 @@ $.fn.chatroom = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/build/minified/modules/dimmer.js b/build/minified/modules/dimmer.js index da1ea1e88..8d24f0480 100644 --- a/build/minified/modules/dimmer.js +++ b/build/minified/modules/dimmer.js @@ -316,7 +316,6 @@ $.fn.dimmer = function(parameters) { }, setting: function(name, value) { - module.debug('Changing setting', name, value); if(value !== undefined) { if( $.isPlainObject(name) ) { $.extend(true, settings, name); diff --git a/build/minified/modules/dropdown.js b/build/minified/modules/dropdown.js index c31938e68..e27b03abd 100644 --- a/build/minified/modules/dropdown.js +++ b/build/minified/modules/dropdown.js @@ -161,7 +161,7 @@ $.fn.dropdown = function(parameters) { var $choice = $(this), text = $choice.data(metadata.text) || $choice.text(), - value = $choice.data(metadata.value) || text + value = $choice.data(metadata.value) || text.toLowerCase() ; if( $choice.find(selector.menu).size() === 0 ) { module.verbose('Adding active state to selected item'); @@ -358,7 +358,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'slide down') { $currentMenu @@ -406,7 +406,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'none') { callback(); @@ -639,7 +639,7 @@ $.fn.dropdown = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/build/minified/modules/modal.js b/build/minified/modules/modal.js index 704aafb3d..5d50b6d77 100644 --- a/build/minified/modules/modal.js +++ b/build/minified/modules/modal.js @@ -157,6 +157,9 @@ $.fn.modal = function(parameters) { module.set.dimmerSettings(); $context.dimmer('show'); }, + hideDimmer: function() { + $context.dimmer('hide'); + }, hide: function() { module.debug('Hiding modal'); @@ -438,7 +441,7 @@ $.fn.modal = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/build/uncompressed/modules/chatroom.js b/build/uncompressed/modules/chatroom.js index fde496f95..7de7a519e 100644 --- a/build/uncompressed/modules/chatroom.js +++ b/build/uncompressed/modules/chatroom.js @@ -574,7 +574,7 @@ $.fn.chatroom = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/build/uncompressed/modules/dimmer.js b/build/uncompressed/modules/dimmer.js index da1ea1e88..8d24f0480 100644 --- a/build/uncompressed/modules/dimmer.js +++ b/build/uncompressed/modules/dimmer.js @@ -316,7 +316,6 @@ $.fn.dimmer = function(parameters) { }, setting: function(name, value) { - module.debug('Changing setting', name, value); if(value !== undefined) { if( $.isPlainObject(name) ) { $.extend(true, settings, name); diff --git a/build/uncompressed/modules/dropdown.js b/build/uncompressed/modules/dropdown.js index c31938e68..e27b03abd 100644 --- a/build/uncompressed/modules/dropdown.js +++ b/build/uncompressed/modules/dropdown.js @@ -161,7 +161,7 @@ $.fn.dropdown = function(parameters) { var $choice = $(this), text = $choice.data(metadata.text) || $choice.text(), - value = $choice.data(metadata.value) || text + value = $choice.data(metadata.value) || text.toLowerCase() ; if( $choice.find(selector.menu).size() === 0 ) { module.verbose('Adding active state to selected item'); @@ -358,7 +358,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'slide down') { $currentMenu @@ -406,7 +406,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'none') { callback(); @@ -639,7 +639,7 @@ $.fn.dropdown = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/build/uncompressed/modules/modal.js b/build/uncompressed/modules/modal.js index 704aafb3d..5d50b6d77 100644 --- a/build/uncompressed/modules/modal.js +++ b/build/uncompressed/modules/modal.js @@ -157,6 +157,9 @@ $.fn.modal = function(parameters) { module.set.dimmerSettings(); $context.dimmer('show'); }, + hideDimmer: function() { + $context.dimmer('hide'); + }, hide: function() { module.debug('Hiding modal'); @@ -438,7 +441,7 @@ $.fn.modal = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/node/src/documents/modules/modal.html.eco b/node/src/documents/modules/modal.html.eco index fc09611f7..3b85c13bd 100755 --- a/node/src/documents/modules/modal.html.eco +++ b/node/src/documents/modules/modal.html.eco @@ -68,8 +68,9 @@ type : 'UI Module'
Usage Behavior - Variations + Types States + Examples Settings
@@ -79,8 +80,8 @@ type : 'UI Module'

Initializing a modal

A modal can be included anywhere on the page. On initialization a modal's current size will be cached, and the element will be detached from the dom and moved inside a dimmer.

-
Why move?
-

Moving a modal to inside the page dimmer allows for 3D animations without having the 3D perspective settings alter the rest of the page content. Additionally, content outside the dimmer can be blurred or altered without affecting the modal's content.

+
Why move modal content?
+

Having a modal inside the page dimmer allows for 3D animations without having the 3D perspective settings alter the rest of the page content. Additionally, content outside the dimmer can be blurred or altered without affecting the modal's content.

$('.ui.modal') @@ -108,6 +109,81 @@ type : 'UI Module'
+

Types

+ +
+

Standard

+

A standard modal

+
+ $('.test.modal') + .modal('show') + ; +
+
+ +
+

Basic

+

A modal can reduce its complexity

+
+ $('.basic.modal') + .modal('show') + ; +
+
+ +

States

+ +
+

Active

+

An active modal is visible on the page

+
+
...
+
+
+ +

Examples

+ +
+

Forcing a Choice

+

You can disable a modal's dimmer from being closed by click to force a user to make a choice

+
+ $('.basic.modal') + .modal('setting', 'closable', false) + .modal('show') + ; +
+
+ +
+

Transitions

+

A dimmer can use any named ui transition.

+
+ + +
Choose transition
+
+
Horizontal Flip
+
Vertical Flip
+
Fade Up
+
Fade
+
Scale
+
+
+
+
+ $('.selection') + .dropdown({ + onChange: function(value) { + $('.test.modal') + .modal('setting', 'transition', value) + .modal('show') + ; + } + }) + ; +
+
+

Behavior

@@ -138,38 +214,48 @@ type : 'UI Module'
-

Variations

- -
-

Basic

-

A modal can reduce its complexity

-
- $('.basic.modal') - .modal({ - closable: false - }) - .modal('show') - ; -
-
- -

States

+ Additionally, all the following behaviors can be called using the syntax $('.foo').modal('behavior name', argumentOne, argumentTwo) -
-

Active

-

An active modal is visible on the page

-
-
...
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
refreshRefreshes centering of modal on page
show dimmerShows associated page dimmer
hide dimmerHides associated page dimmer
hide allHides all visible modals initialized at the same time
cache sizesCaches current modal size
can fitReturns whether the modal can fit on the page
is activeReturns whether the modal is active
set activeSets modal to active

Settings

-
-

Modal Settings

Modal settings modify the modal's behavior

- +
@@ -223,7 +309,7 @@ type : 'UI Module'

Callbacks

Callback settings specify a function to occur after a specific behavior.

-
Setting Default
+
@@ -243,13 +329,9 @@ type : 'UI Module'
Setting Context
-
- -
-

DOM Settings

DOM settings specify how this module should interface with the DOM

- +
@@ -266,7 +348,7 @@ type : 'UI Module' @@ -276,6 +358,7 @@ type : 'UI Module'
Setting Default
selector : { - close : '.close' + close : '.close, .actions .button' },
className : { + active : 'active', scrolling : 'scrolling' }
@@ -284,13 +367,9 @@ type : 'UI Module'
-
- -
-

Debug Settings

Debug settings controls debug output to the console

- +
@@ -330,7 +409,6 @@ type : 'UI Module'
Setting Default
-
diff --git a/node/src/files/build/less/modules/chatroom.js b/node/src/files/build/less/modules/chatroom.js index fde496f95..7de7a519e 100644 --- a/node/src/files/build/less/modules/chatroom.js +++ b/node/src/files/build/less/modules/chatroom.js @@ -574,7 +574,7 @@ $.fn.chatroom = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/node/src/files/build/less/modules/dimmer.js b/node/src/files/build/less/modules/dimmer.js index da1ea1e88..8d24f0480 100644 --- a/node/src/files/build/less/modules/dimmer.js +++ b/node/src/files/build/less/modules/dimmer.js @@ -316,7 +316,6 @@ $.fn.dimmer = function(parameters) { }, setting: function(name, value) { - module.debug('Changing setting', name, value); if(value !== undefined) { if( $.isPlainObject(name) ) { $.extend(true, settings, name); diff --git a/node/src/files/build/less/modules/dropdown.js b/node/src/files/build/less/modules/dropdown.js index c31938e68..e27b03abd 100644 --- a/node/src/files/build/less/modules/dropdown.js +++ b/node/src/files/build/less/modules/dropdown.js @@ -161,7 +161,7 @@ $.fn.dropdown = function(parameters) { var $choice = $(this), text = $choice.data(metadata.text) || $choice.text(), - value = $choice.data(metadata.value) || text + value = $choice.data(metadata.value) || text.toLowerCase() ; if( $choice.find(selector.menu).size() === 0 ) { module.verbose('Adding active state to selected item'); @@ -358,7 +358,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'slide down') { $currentMenu @@ -406,7 +406,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'none') { callback(); @@ -639,7 +639,7 @@ $.fn.dropdown = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/node/src/files/build/less/modules/modal.js b/node/src/files/build/less/modules/modal.js index 704aafb3d..5d50b6d77 100644 --- a/node/src/files/build/less/modules/modal.js +++ b/node/src/files/build/less/modules/modal.js @@ -157,6 +157,9 @@ $.fn.modal = function(parameters) { module.set.dimmerSettings(); $context.dimmer('show'); }, + hideDimmer: function() { + $context.dimmer('hide'); + }, hide: function() { module.debug('Hiding modal'); @@ -438,7 +441,7 @@ $.fn.modal = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/node/src/files/build/minified/modules/chatroom.js b/node/src/files/build/minified/modules/chatroom.js index fde496f95..7de7a519e 100644 --- a/node/src/files/build/minified/modules/chatroom.js +++ b/node/src/files/build/minified/modules/chatroom.js @@ -574,7 +574,7 @@ $.fn.chatroom = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/node/src/files/build/minified/modules/dimmer.js b/node/src/files/build/minified/modules/dimmer.js index da1ea1e88..8d24f0480 100644 --- a/node/src/files/build/minified/modules/dimmer.js +++ b/node/src/files/build/minified/modules/dimmer.js @@ -316,7 +316,6 @@ $.fn.dimmer = function(parameters) { }, setting: function(name, value) { - module.debug('Changing setting', name, value); if(value !== undefined) { if( $.isPlainObject(name) ) { $.extend(true, settings, name); diff --git a/node/src/files/build/minified/modules/dropdown.js b/node/src/files/build/minified/modules/dropdown.js index c31938e68..e27b03abd 100644 --- a/node/src/files/build/minified/modules/dropdown.js +++ b/node/src/files/build/minified/modules/dropdown.js @@ -161,7 +161,7 @@ $.fn.dropdown = function(parameters) { var $choice = $(this), text = $choice.data(metadata.text) || $choice.text(), - value = $choice.data(metadata.value) || text + value = $choice.data(metadata.value) || text.toLowerCase() ; if( $choice.find(selector.menu).size() === 0 ) { module.verbose('Adding active state to selected item'); @@ -358,7 +358,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'slide down') { $currentMenu @@ -406,7 +406,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'none') { callback(); @@ -639,7 +639,7 @@ $.fn.dropdown = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/node/src/files/build/minified/modules/modal.js b/node/src/files/build/minified/modules/modal.js index 704aafb3d..5d50b6d77 100644 --- a/node/src/files/build/minified/modules/modal.js +++ b/node/src/files/build/minified/modules/modal.js @@ -157,6 +157,9 @@ $.fn.modal = function(parameters) { module.set.dimmerSettings(); $context.dimmer('show'); }, + hideDimmer: function() { + $context.dimmer('hide'); + }, hide: function() { module.debug('Hiding modal'); @@ -438,7 +441,7 @@ $.fn.modal = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/node/src/files/build/uncompressed/modules/chatroom.js b/node/src/files/build/uncompressed/modules/chatroom.js index fde496f95..7de7a519e 100644 --- a/node/src/files/build/uncompressed/modules/chatroom.js +++ b/node/src/files/build/uncompressed/modules/chatroom.js @@ -574,7 +574,7 @@ $.fn.chatroom = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/node/src/files/build/uncompressed/modules/dimmer.js b/node/src/files/build/uncompressed/modules/dimmer.js index da1ea1e88..8d24f0480 100644 --- a/node/src/files/build/uncompressed/modules/dimmer.js +++ b/node/src/files/build/uncompressed/modules/dimmer.js @@ -316,7 +316,6 @@ $.fn.dimmer = function(parameters) { }, setting: function(name, value) { - module.debug('Changing setting', name, value); if(value !== undefined) { if( $.isPlainObject(name) ) { $.extend(true, settings, name); diff --git a/node/src/files/build/uncompressed/modules/dropdown.js b/node/src/files/build/uncompressed/modules/dropdown.js index c31938e68..e27b03abd 100644 --- a/node/src/files/build/uncompressed/modules/dropdown.js +++ b/node/src/files/build/uncompressed/modules/dropdown.js @@ -161,7 +161,7 @@ $.fn.dropdown = function(parameters) { var $choice = $(this), text = $choice.data(metadata.text) || $choice.text(), - value = $choice.data(metadata.value) || text + value = $choice.data(metadata.value) || text.toLowerCase() ; if( $choice.find(selector.menu).size() === 0 ) { module.verbose('Adding active state to selected item'); @@ -358,7 +358,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'slide down') { $currentMenu @@ -406,7 +406,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'none') { callback(); @@ -639,7 +639,7 @@ $.fn.dropdown = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/node/src/files/build/uncompressed/modules/modal.js b/node/src/files/build/uncompressed/modules/modal.js index 704aafb3d..5d50b6d77 100644 --- a/node/src/files/build/uncompressed/modules/modal.js +++ b/node/src/files/build/uncompressed/modules/modal.js @@ -157,6 +157,9 @@ $.fn.modal = function(parameters) { module.set.dimmerSettings(); $context.dimmer('show'); }, + hideDimmer: function() { + $context.dimmer('hide'); + }, hide: function() { module.debug('Hiding modal'); @@ -438,7 +441,7 @@ $.fn.modal = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/node/src/files/generated/module.commented.html b/node/src/files/generated/module.commented.html index fbd567aa8..e71118b08 100755 --- a/node/src/files/generated/module.commented.html +++ b/node/src/files/generated/module.commented.html @@ -687,7 +687,7 @@ The module checks to see if you passed in a method name to call

if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } diff --git a/node/src/files/javascript/modal.js b/node/src/files/javascript/modal.js index ce53e00fe..2d016268e 100755 --- a/node/src/files/javascript/modal.js +++ b/node/src/files/javascript/modal.js @@ -14,6 +14,17 @@ semantic.modal.ready = function() { }; + $('.selection') + .dropdown({ + onChange: function(value) { + $('.test.modal') + .modal('setting', 'transition', value) + .modal('show') + ; + } + }) + ; + }; diff --git a/src/modules/chatroom.js b/src/modules/chatroom.js index fde496f95..7de7a519e 100755 --- a/src/modules/chatroom.js +++ b/src/modules/chatroom.js @@ -574,7 +574,7 @@ $.fn.chatroom = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/src/modules/dimmer.js b/src/modules/dimmer.js index da1ea1e88..8d24f0480 100755 --- a/src/modules/dimmer.js +++ b/src/modules/dimmer.js @@ -316,7 +316,6 @@ $.fn.dimmer = function(parameters) { }, setting: function(name, value) { - module.debug('Changing setting', name, value); if(value !== undefined) { if( $.isPlainObject(name) ) { $.extend(true, settings, name); diff --git a/src/modules/dropdown.js b/src/modules/dropdown.js index c31938e68..e27b03abd 100755 --- a/src/modules/dropdown.js +++ b/src/modules/dropdown.js @@ -161,7 +161,7 @@ $.fn.dropdown = function(parameters) { var $choice = $(this), text = $choice.data(metadata.text) || $choice.text(), - value = $choice.data(metadata.value) || text + value = $choice.data(metadata.value) || text.toLowerCase() ; if( $choice.find(selector.menu).size() === 0 ) { module.verbose('Adding active state to selected item'); @@ -358,7 +358,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'slide down') { $currentMenu @@ -406,7 +406,7 @@ $.fn.dropdown = function(parameters) { duration : settings.duration, complete : callback, queue : false - }) + }); } else if(settings.transition == 'none') { callback(); @@ -639,7 +639,7 @@ $.fn.dropdown = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) { diff --git a/src/modules/modal.js b/src/modules/modal.js index 704aafb3d..5d50b6d77 100755 --- a/src/modules/modal.js +++ b/src/modules/modal.js @@ -157,6 +157,9 @@ $.fn.modal = function(parameters) { module.set.dimmerSettings(); $context.dimmer('show'); }, + hideDimmer: function() { + $context.dimmer('hide'); + }, hide: function() { module.debug('Hiding modal'); @@ -438,7 +441,7 @@ $.fn.modal = function(parameters) { if(instance === undefined) { module.initialize(); } - invokedResponse = module.invoke(query); + module.invoke(query); } else { if(instance !== undefined) {