Browse Source

updates invoke to never return the function called, adds hide dimmer to modal

pull/110/head
jlukic 11 years ago
parent
commit
ec8ea4a67a
32 changed files with 200 additions and 92 deletions
  1. 5
      RELEASE NOTES.md
  2. 2
      build/less/modules/chatroom.js
  3. 1
      build/less/modules/dimmer.js
  4. 8
      build/less/modules/dropdown.js
  5. 5
      build/less/modules/modal.js
  6. 2
      build/minified/modules/chatroom.js
  7. 1
      build/minified/modules/dimmer.js
  8. 8
      build/minified/modules/dropdown.js
  9. 5
      build/minified/modules/modal.js
  10. 2
      build/uncompressed/modules/chatroom.js
  11. 1
      build/uncompressed/modules/dimmer.js
  12. 8
      build/uncompressed/modules/dropdown.js
  13. 5
      build/uncompressed/modules/modal.js
  14. 162
      node/src/documents/modules/modal.html.eco
  15. 2
      node/src/files/build/less/modules/chatroom.js
  16. 1
      node/src/files/build/less/modules/dimmer.js
  17. 8
      node/src/files/build/less/modules/dropdown.js
  18. 5
      node/src/files/build/less/modules/modal.js
  19. 2
      node/src/files/build/minified/modules/chatroom.js
  20. 1
      node/src/files/build/minified/modules/dimmer.js
  21. 8
      node/src/files/build/minified/modules/dropdown.js
  22. 5
      node/src/files/build/minified/modules/modal.js
  23. 2
      node/src/files/build/uncompressed/modules/chatroom.js
  24. 1
      node/src/files/build/uncompressed/modules/dimmer.js
  25. 8
      node/src/files/build/uncompressed/modules/dropdown.js
  26. 5
      node/src/files/build/uncompressed/modules/modal.js
  27. 2
      node/src/files/generated/module.commented.html
  28. 11
      node/src/files/javascript/modal.js
  29. 2
      src/modules/chatroom.js
  30. 1
      src/modules/dimmer.js
  31. 8
      src/modules/dropdown.js
  32. 5
      src/modules/modal.js

5
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**

2
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) {

1
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);

8
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) {

5
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) {

2
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) {

1
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);

8
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) {

5
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) {

2
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) {

1
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);

8
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) {

5
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) {

162
node/src/documents/modules/modal.html.eco

@ -68,8 +68,9 @@ type : 'UI Module'
<div class="ui vertical pointing secondary menu">
<a class="active item">Usage</a>
<a class="item">Behavior</a>
<a class="item">Variations</a>
<a class="item">Types</a>
<a class="item">States</a>
<a class="item">Examples</a>
<a class="item">Settings</a>
</div>
</div>
@ -79,8 +80,8 @@ type : 'UI Module'
<h3 class="ui header">Initializing a modal</h3>
<p>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.</p>
<div class="ui info message">
<div class="header">Why move?</div>
<p>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.</p>
<div class="header">Why move modal content?</div>
<p>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.</p>
</div>
<div class="code" data-type="javascript">
$('.ui.modal')
@ -108,6 +109,81 @@ type : 'UI Module'
</div>
</div>
<h2 class="ui dividing header">Types</h2>
<div class="example">
<h4 class="ui header">Standard</h4>
<p>A standard modal</p>
<div class="code" data-demo="true">
$('.test.modal')
.modal('show')
;
</div>
</div>
<div class="example">
<h4 class="ui header">Basic</h4>
<p>A modal can reduce its complexity</p>
<div class="code" data-demo="true">
$('.basic.modal')
.modal('show')
;
</div>
</div>
<h2 class="ui dividing header">States</h2>
<div class="example">
<h4 class="ui header">Active</h4>
<p>An active modal is visible on the page</p>
<div class="code" data-type="html">
<div class="active ui modal">...</div>
</div>
</div>
<h2 class="ui dividing header">Examples</h2>
<div class="no example">
<h4 class="ui header">Forcing a Choice</h4>
<p>You can disable a modal's dimmer from being closed by click to force a user to make a choice</p>
<div class="code" data-demo="true">
$('.basic.modal')
.modal('setting', 'closable', false)
.modal('show')
;
</div>
</div>
<div class="no example">
<h4 class="ui header">Transitions</h4>
<p>A dimmer can use any named ui transition.</p>
<div class="ui selection dropdown">
<input type="hidden" name="transition">
<i class="dropdown icon"></i>
<div class="default text">Choose transition</div>
<div class="menu">
<div class="item">Horizontal Flip</div>
<div class="item">Vertical Flip</div>
<div class="item">Fade Up</div>
<div class="item">Fade</div>
<div class="item">Scale</div>
</div>
</div>
<div class="ui clearing divider"></div>
<div class="code">
$('.selection')
.dropdown({
onChange: function(value) {
$('.test.modal')
.modal('setting', 'transition', value)
.modal('show')
;
}
})
;
</div>
</div>
<h2 class="ui dividing header">Behavior</h2>
<div class="no example">
@ -138,38 +214,48 @@ type : 'UI Module'
</div>
</div>
<h2 class="ui dividing header">Variations</h2>
<div class="example">
<h4 class="ui header">Basic</h4>
<p>A modal can reduce its complexity</p>
<div class="code" data-demo="true">
$('.basic.modal')
.modal({
closable: false
})
.modal('show')
;
</div>
</div>
<h2 class="ui dividing header">States</h2>
Additionally, all the following behaviors can be called using the syntax <code>$('.foo').modal('behavior name', argumentOne, argumentTwo)</code>
<div class="example">
<h4 class="ui header">Active</h4>
<p>An active modal is visible on the page</p>
<div class="code" data-type="html">
<div class="active ui modal">...</div>
</div>
</div>
<table class="ui definition celled table segment">
<tr>
<td>refresh</td>
<td>Refreshes centering of modal on page</td>
</tr>
<tr>
<td>show dimmer</td>
<td>Shows associated page dimmer</td>
</tr>
<tr>
<td>hide dimmer</td>
<td>Hides associated page dimmer</td>
</tr>
<tr>
<td>hide all</td>
<td>Hides all visible modals initialized at the same time</td>
</tr>
<tr>
<td>cache sizes</td>
<td>Caches current modal size</td>
</tr>
<tr>
<td>can fit</td>
<td>Returns whether the modal can fit on the page</td>
</tr>
<tr>
<td>is active</td>
<td>Returns whether the modal is active</td>
</tr>
<tr>
<td>set active</td>
<td>Sets modal to active</td>
</tr>
</table>
<h2 class="ui dividing header">Settings</h2>
<div class="no example">
<h4 class="ui header">Modal Settings</h4>
<p>Modal settings modify the modal's behavior</p>
<table class="ui celled definition table segment">
<table class="ui red celled definition table segment">
<thead>
<th>Setting</th>
<th class="four wide">Default</th>
@ -223,7 +309,7 @@ type : 'UI Module'
<h4 class="ui header">Callbacks</h4>
<p>Callback settings specify a function to occur after a specific behavior.</p>
<table class="ui celled definition table segment">
<table class="ui green celled definition table segment">
<thead>
<th class="four wide">Setting</th>
<th>Context</th>
@ -243,13 +329,9 @@ type : 'UI Module'
</tbody>
</table>
</div>
<div class="no example">
<h4 class="ui header">DOM Settings</h4>
<p>DOM settings specify how this module should interface with the DOM</p>
<table class="ui celled definition table segment">
<table class="ui purple celled definition table segment">
<thead>
<th>Setting</th>
<th class="four wide">Default</th>
@ -266,7 +348,7 @@ type : 'UI Module'
<td colspan="2">
<div class="code">
selector : {
close : '.close'
close : '.close, .actions .button'
},
</div>
</td>
@ -276,6 +358,7 @@ type : 'UI Module'
<td colspan="2">
<div class="code">
className : {
active : 'active',
scrolling : 'scrolling'
}
</div>
@ -284,13 +367,9 @@ type : 'UI Module'
</tbody>
</table>
</div>
<div class="no example">
<h4 class="ui header">Debug Settings</h4>
<p>Debug settings controls debug output to the console</p>
<table class="ui celled definition table segment">
<table class="ui blue celled definition table segment">
<thead>
<th>Setting</th>
<th class="four wide">Default</th>
@ -330,7 +409,6 @@ type : 'UI Module'
</tbody>
</table>
</div>
</div>
</body>

2
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) {

1
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);

8
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) {

5
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) {

2
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) {

1
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);

8
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) {

5
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) {

2
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) {

1
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);

8
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) {

5
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) {

2
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</p>
<span class="keyword">if</span>(instance === <span class="literal">undefined</span>) {
module.initialize();
}
invokedResponse = module.invoke(query);
module.invoke(query);
}</pre></div></div>
</li>

11
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')
;
}
})
;
};

2
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) {

1
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);

8
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) {

5
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) {

Loading…
Cancel
Save