lukechilds
/
Semantic-UI-Docs
mirror of https://github.com/lukechilds/Semantic-UI-Docs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

rebuilds package and upticks version

beta
jlukic 11 years ago
parent
2f2439f446
commit
826bfe795f
17 changed files with 238 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      RELEASE NOTES.md
  2. 41
      build/less/modules/modal.js
  3. 41
      build/minified/modules/modal.js
  4. 2
      build/minified/modules/modal.min.js
  5. 2
      build/packaged/css/semantic.min.css
  6. 41
      build/packaged/javascript/semantic.js
  7. 4
      build/packaged/javascript/semantic.min.js
  8. 41
      build/uncompressed/modules/modal.js
  9. 2
      node/package.json
  10. 2
      node/src/documents/index.html.eco
  11. 41
      rtl/less/modules/modal.js
  12. 41
      rtl/minified/modules/modal.js
  13. 2
      rtl/minified/modules/modal.min.js
  14. 2
      rtl/packaged/css/semantic.min.css
  15. 41
      rtl/packaged/javascript/semantic.js
  16. 4
      rtl/packaged/javascript/semantic.min.js
  17. 41
      rtl/uncompressed/modules/modal.js

5
RELEASE NOTES.md
View File

@ -1,6 +1,9 @@
## RELEASE NOTES
### Version 0.5.1 - Oct 10, 2013
### Version 0.5.1 - Oct 11, 2013
**Fixes**
- Fixes issue with modal sometimes closing/opening multiple times caused by changes in 0.5.0
**Updates**
- Fixes vertical alignment of checkboxes

41
build/less/modules/modal.js
View File

@ -50,6 +50,7 @@ $.fn.modal = function(parameters) {
$close = $module.find(selector.close),
$focusedElement,
$dimmable,
$dimmer,
element = this,
@ -62,9 +63,12 @@ $.fn.modal = function(parameters) {
initialize: function() {
module.verbose('Initializing dimmer', $context);
$dimmer = $context
$dimmable = $context
.dimmer('add content', $module)
;
$dimmer = $context
.dimmer('get dimmer')
;
module.verbose('Attaching close events', $close);
$close
@ -125,6 +129,13 @@ $.fn.modal = function(parameters) {
module.verbose('Close button pressed');
module.hide();
},
click: function(event) {
module.verbose('Determining if event occured on dimmer', event);
if( $dimmer.find(event.target).size() === 0 ) {
module.hide();
event.stopImmediatePropagation();
}
},
debounce: function(method, delay) {
clearTimeout(module.timer);
module.timer = setTimeout(method, delay);
@ -141,7 +152,7 @@ $.fn.modal = function(parameters) {
}
},
resize: function() {
if( $dimmer.dimmer('is active') ) {
if( $dimmable.dimmer('is active') ) {
module.refresh();
}
}
@ -178,12 +189,17 @@ $.fn.modal = function(parameters) {
showDimmer: function() {
module.debug('Showing modal');
module.set.dimmerSettings();
$dimmer.dimmer('show');
$dimmable.dimmer('show');
},
hide: function() {
if( $dimmer.dimmer('is active') ) {
$dimmer.dimmer('hide');
if(settings.closable) {
$dimmer
.off('click' + eventNamespace)
;
}
if( $dimmable.dimmer('is active') ) {
$dimmable.dimmer('hide');
}
if( module.is.active() ) {
module.hideModal();
@ -196,7 +212,7 @@ $.fn.modal = function(parameters) {
hideDimmer: function() {
module.debug('Hiding dimmer');
$dimmer.dimmer('hide');
$dimmable.dimmer('hide');
},
hideModal: function() {
@ -261,7 +277,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.removeClass(className.scrolling);
$dimmable.removeClass(className.scrolling);
$module.removeClass(className.scrolling);
}
},
@ -271,7 +287,7 @@ $.fn.modal = function(parameters) {
height : $module.outerHeight() + settings.offset,
contextHeight : (settings.context == 'body')
? $(window).height()
: $dimmer.height()
: $dimmable.height()
};
module.debug('Caching modal and container sizes', module.cache);
},
@ -297,14 +313,13 @@ $.fn.modal = function(parameters) {
;
if(settings.closable) {
$dimmer
.dimmer('get dimmer')
.on('click', module.hide)
.on('click' + eventNamespace, module.event.click)
;
}
},
dimmerSettings: function() {
module.debug('Setting dimmer settings', $dimmer);
$dimmer
module.debug('Setting dimmer settings', $dimmable);
$dimmable
.dimmer('setting', 'closable', false)
.dimmer('setting', 'duration', {
show : settings.duration * 0.95,
@ -317,7 +332,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.addClass(className.scrolling);
$dimmable.addClass(className.scrolling);
$module.addClass(className.scrolling);
},
type: function() {

41
build/minified/modules/modal.js
View File

@ -50,6 +50,7 @@ $.fn.modal = function(parameters) {
$close = $module.find(selector.close),
$focusedElement,
$dimmable,
$dimmer,
element = this,
@ -62,9 +63,12 @@ $.fn.modal = function(parameters) {
initialize: function() {
module.verbose('Initializing dimmer', $context);
$dimmer = $context
$dimmable = $context
.dimmer('add content', $module)
;
$dimmer = $context
.dimmer('get dimmer')
;
module.verbose('Attaching close events', $close);
$close
@ -125,6 +129,13 @@ $.fn.modal = function(parameters) {
module.verbose('Close button pressed');
module.hide();
},
click: function(event) {
module.verbose('Determining if event occured on dimmer', event);
if( $dimmer.find(event.target).size() === 0 ) {
module.hide();
event.stopImmediatePropagation();
}
},
debounce: function(method, delay) {
clearTimeout(module.timer);
module.timer = setTimeout(method, delay);
@ -141,7 +152,7 @@ $.fn.modal = function(parameters) {
}
},
resize: function() {
if( $dimmer.dimmer('is active') ) {
if( $dimmable.dimmer('is active') ) {
module.refresh();
}
}
@ -178,12 +189,17 @@ $.fn.modal = function(parameters) {
showDimmer: function() {
module.debug('Showing modal');
module.set.dimmerSettings();
$dimmer.dimmer('show');
$dimmable.dimmer('show');
},
hide: function() {
if( $dimmer.dimmer('is active') ) {
$dimmer.dimmer('hide');
if(settings.closable) {
$dimmer
.off('click' + eventNamespace)
;
}
if( $dimmable.dimmer('is active') ) {
$dimmable.dimmer('hide');
}
if( module.is.active() ) {
module.hideModal();
@ -196,7 +212,7 @@ $.fn.modal = function(parameters) {
hideDimmer: function() {
module.debug('Hiding dimmer');
$dimmer.dimmer('hide');
$dimmable.dimmer('hide');
},
hideModal: function() {
@ -261,7 +277,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.removeClass(className.scrolling);
$dimmable.removeClass(className.scrolling);
$module.removeClass(className.scrolling);
}
},
@ -271,7 +287,7 @@ $.fn.modal = function(parameters) {
height : $module.outerHeight() + settings.offset,
contextHeight : (settings.context == 'body')
? $(window).height()
: $dimmer.height()
: $dimmable.height()
};
module.debug('Caching modal and container sizes', module.cache);
},
@ -297,14 +313,13 @@ $.fn.modal = function(parameters) {
;
if(settings.closable) {
$dimmer
.dimmer('get dimmer')
.on('click', module.hide)
.on('click' + eventNamespace, module.event.click)
;
}
},
dimmerSettings: function() {
module.debug('Setting dimmer settings', $dimmer);
$dimmer
module.debug('Setting dimmer settings', $dimmable);
$dimmable
.dimmer('setting', 'closable', false)
.dimmer('setting', 'duration', {
show : settings.duration * 0.95,
@ -317,7 +332,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.addClass(className.scrolling);
$dimmable.addClass(className.scrolling);
$module.addClass(className.scrolling);
},
type: function() {

2
build/minified/modules/modal.min.js
View File

File diff suppressed because one or more lines are too long

2
build/packaged/css/semantic.min.css
View File

File diff suppressed because one or more lines are too long

41
build/packaged/javascript/semantic.js
View File

@ -5237,6 +5237,7 @@ $.fn.modal = function(parameters) {
$close = $module.find(selector.close),
$focusedElement,
$dimmable,
$dimmer,
element = this,
@ -5249,9 +5250,12 @@ $.fn.modal = function(parameters) {
initialize: function() {
module.verbose('Initializing dimmer', $context);
$dimmer = $context
$dimmable = $context
.dimmer('add content', $module)
;
$dimmer = $context
.dimmer('get dimmer')
;
module.verbose('Attaching close events', $close);
$close
@ -5312,6 +5316,13 @@ $.fn.modal = function(parameters) {
module.verbose('Close button pressed');
module.hide();
},
click: function(event) {
module.verbose('Determining if event occured on dimmer', event);
if( $dimmer.find(event.target).size() === 0 ) {
module.hide();
event.stopImmediatePropagation();
}
},
debounce: function(method, delay) {
clearTimeout(module.timer);
module.timer = setTimeout(method, delay);
@ -5328,7 +5339,7 @@ $.fn.modal = function(parameters) {
}
},
resize: function() {
if( $dimmer.dimmer('is active') ) {
if( $dimmable.dimmer('is active') ) {
module.refresh();
}
}
@ -5365,12 +5376,17 @@ $.fn.modal = function(parameters) {
showDimmer: function() {
module.debug('Showing modal');
module.set.dimmerSettings();
$dimmer.dimmer('show');
$dimmable.dimmer('show');
},
hide: function() {
if( $dimmer.dimmer('is active') ) {
$dimmer.dimmer('hide');
if(settings.closable) {
$dimmer
.off('click' + eventNamespace)
;
}
if( $dimmable.dimmer('is active') ) {
$dimmable.dimmer('hide');
}
if( module.is.active() ) {
module.hideModal();
@ -5383,7 +5399,7 @@ $.fn.modal = function(parameters) {
hideDimmer: function() {
module.debug('Hiding dimmer');
$dimmer.dimmer('hide');
$dimmable.dimmer('hide');
},
hideModal: function() {
@ -5448,7 +5464,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.removeClass(className.scrolling);
$dimmable.removeClass(className.scrolling);
$module.removeClass(className.scrolling);
}
},
@ -5458,7 +5474,7 @@ $.fn.modal = function(parameters) {
height : $module.outerHeight() + settings.offset,
contextHeight : (settings.context == 'body')
? $(window).height()
: $dimmer.height()
: $dimmable.height()
};
module.debug('Caching modal and container sizes', module.cache);
},
@ -5484,14 +5500,13 @@ $.fn.modal = function(parameters) {
;
if(settings.closable) {
$dimmer
.dimmer('get dimmer')
.on('click', module.hide)
.on('click' + eventNamespace, module.event.click)
;
}
},
dimmerSettings: function() {
module.debug('Setting dimmer settings', $dimmer);
$dimmer
module.debug('Setting dimmer settings', $dimmable);
$dimmable
.dimmer('setting', 'closable', false)
.dimmer('setting', 'duration', {
show : settings.duration * 0.95,
@ -5504,7 +5519,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.addClass(className.scrolling);
$dimmable.addClass(className.scrolling);
$module.addClass(className.scrolling);
},
type: function() {

4
build/packaged/javascript/semantic.min.js
View File

File diff suppressed because one or more lines are too long

41
build/uncompressed/modules/modal.js
View File

@ -50,6 +50,7 @@ $.fn.modal = function(parameters) {
$close = $module.find(selector.close),
$focusedElement,
$dimmable,
$dimmer,
element = this,
@ -62,9 +63,12 @@ $.fn.modal = function(parameters) {
initialize: function() {
module.verbose('Initializing dimmer', $context);
$dimmer = $context
$dimmable = $context
.dimmer('add content', $module)
;
$dimmer = $context
.dimmer('get dimmer')
;
module.verbose('Attaching close events', $close);
$close
@ -125,6 +129,13 @@ $.fn.modal = function(parameters) {
module.verbose('Close button pressed');
module.hide();
},
click: function(event) {
module.verbose('Determining if event occured on dimmer', event);
if( $dimmer.find(event.target).size() === 0 ) {
module.hide();
event.stopImmediatePropagation();
}
},
debounce: function(method, delay) {
clearTimeout(module.timer);
module.timer = setTimeout(method, delay);
@ -141,7 +152,7 @@ $.fn.modal = function(parameters) {
}
},
resize: function() {
if( $dimmer.dimmer('is active') ) {
if( $dimmable.dimmer('is active') ) {
module.refresh();
}
}
@ -178,12 +189,17 @@ $.fn.modal = function(parameters) {
showDimmer: function() {
module.debug('Showing modal');
module.set.dimmerSettings();
$dimmer.dimmer('show');
$dimmable.dimmer('show');
},
hide: function() {
if( $dimmer.dimmer('is active') ) {
$dimmer.dimmer('hide');
if(settings.closable) {
$dimmer
.off('click' + eventNamespace)
;
}
if( $dimmable.dimmer('is active') ) {
$dimmable.dimmer('hide');
}
if( module.is.active() ) {
module.hideModal();
@ -196,7 +212,7 @@ $.fn.modal = function(parameters) {
hideDimmer: function() {
module.debug('Hiding dimmer');
$dimmer.dimmer('hide');
$dimmable.dimmer('hide');
},
hideModal: function() {
@ -261,7 +277,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.removeClass(className.scrolling);
$dimmable.removeClass(className.scrolling);
$module.removeClass(className.scrolling);
}
},
@ -271,7 +287,7 @@ $.fn.modal = function(parameters) {
height : $module.outerHeight() + settings.offset,
contextHeight : (settings.context == 'body')
? $(window).height()
: $dimmer.height()
: $dimmable.height()
};
module.debug('Caching modal and container sizes', module.cache);
},
@ -297,14 +313,13 @@ $.fn.modal = function(parameters) {
;
if(settings.closable) {
$dimmer
.dimmer('get dimmer')
.on('click', module.hide)
.on('click' + eventNamespace, module.event.click)
;
}
},
dimmerSettings: function() {
module.debug('Setting dimmer settings', $dimmer);
$dimmer
module.debug('Setting dimmer settings', $dimmable);
$dimmable
.dimmer('setting', 'closable', false)
.dimmer('setting', 'duration', {
show : settings.duration * 0.95,
@ -317,7 +332,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.addClass(className.scrolling);
$dimmable.addClass(className.scrolling);
$module.addClass(className.scrolling);
},
type: function() {

2
node/package.json
View File

@ -1,7 +1,7 @@
{
"semantic": {
"name": "Semantic UI",
"version": "0.5.0"
"version": "0.5.1"
},
"dependencies": {
"docpad": "~6.53.4",

2
node/src/documents/index.html.eco
View File

@ -15,7 +15,7 @@ type : 'Semantic'
<div class="ui page grid">
<div class="column">
<div class="introduction">
<h1 class="ui header">Semantic UI <a class="ui black label" href="https://github.com/jlukic/Semantic-UI/blob/master/RELEASE%20NOTES.md">0.5.0</a></h1>
<h1 class="ui header">Semantic UI <a class="ui black label" href="https://github.com/jlukic/Semantic-UI/blob/master/RELEASE%20NOTES.md">0.5.1</a></h1>
<h2 class="ui header">UI is the vocabulary of the web.</h2>
<p>Semantic empowers designers and developers by creating a language for sharing UI.</p>
<a class="ui black large labeled launch icon button"><i class="icon list layout"></i> View UI</a>

41
rtl/less/modules/modal.js
View File

@ -50,6 +50,7 @@ $.fn.modal = function(parameters) {
$close = $module.find(selector.close),
$focusedElement,
$dimmable,
$dimmer,
element = this,
@ -62,9 +63,12 @@ $.fn.modal = function(parameters) {
initialize: function() {
module.verbose('Initializing dimmer', $context);
$dimmer = $context
$dimmable = $context
.dimmer('add content', $module)
;
$dimmer = $context
.dimmer('get dimmer')
;
module.verbose('Attaching close events', $close);
$close
@ -125,6 +129,13 @@ $.fn.modal = function(parameters) {
module.verbose('Close button pressed');
module.hide();
},
click: function(event) {
module.verbose('Determining if event occured on dimmer', event);
if( $dimmer.find(event.target).size() === 0 ) {
module.hide();
event.stopImmediatePropagation();
}
},
debounce: function(method, delay) {
clearTimeout(module.timer);
module.timer = setTimeout(method, delay);
@ -141,7 +152,7 @@ $.fn.modal = function(parameters) {
}
},
resize: function() {
if( $dimmer.dimmer('is active') ) {
if( $dimmable.dimmer('is active') ) {
module.refresh();
}
}
@ -178,12 +189,17 @@ $.fn.modal = function(parameters) {
showDimmer: function() {
module.debug('Showing modal');
module.set.dimmerSettings();
$dimmer.dimmer('show');
$dimmable.dimmer('show');
},
hide: function() {
if( $dimmer.dimmer('is active') ) {
$dimmer.dimmer('hide');
if(settings.closable) {
$dimmer
.off('click' + eventNamespace)
;
}
if( $dimmable.dimmer('is active') ) {
$dimmable.dimmer('hide');
}
if( module.is.active() ) {
module.hideModal();
@ -196,7 +212,7 @@ $.fn.modal = function(parameters) {
hideDimmer: function() {
module.debug('Hiding dimmer');
$dimmer.dimmer('hide');
$dimmable.dimmer('hide');
},
hideModal: function() {
@ -261,7 +277,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.removeClass(className.scrolling);
$dimmable.removeClass(className.scrolling);
$module.removeClass(className.scrolling);
}
},
@ -271,7 +287,7 @@ $.fn.modal = function(parameters) {
height : $module.outerHeight() + settings.offset,
contextHeight : (settings.context == 'body')
? $(window).height()
: $dimmer.height()
: $dimmable.height()
};
module.debug('Caching modal and container sizes', module.cache);
},
@ -297,14 +313,13 @@ $.fn.modal = function(parameters) {
;
if(settings.closable) {
$dimmer
.dimmer('get dimmer')
.on('click', module.hide)
.on('click' + eventNamespace, module.event.click)
;
}
},
dimmerSettings: function() {
module.debug('Setting dimmer settings', $dimmer);
$dimmer
module.debug('Setting dimmer settings', $dimmable);
$dimmable
.dimmer('setting', 'closable', false)
.dimmer('setting', 'duration', {
show : settings.duration * 0.95,
@ -317,7 +332,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.addClass(className.scrolling);
$dimmable.addClass(className.scrolling);
$module.addClass(className.scrolling);
},
type: function() {

41
rtl/minified/modules/modal.js
View File

@ -50,6 +50,7 @@ $.fn.modal = function(parameters) {
$close = $module.find(selector.close),
$focusedElement,
$dimmable,
$dimmer,
element = this,
@ -62,9 +63,12 @@ $.fn.modal = function(parameters) {
initialize: function() {
module.verbose('Initializing dimmer', $context);
$dimmer = $context
$dimmable = $context
.dimmer('add content', $module)
;
$dimmer = $context
.dimmer('get dimmer')
;
module.verbose('Attaching close events', $close);
$close
@ -125,6 +129,13 @@ $.fn.modal = function(parameters) {
module.verbose('Close button pressed');
module.hide();
},
click: function(event) {
module.verbose('Determining if event occured on dimmer', event);
if( $dimmer.find(event.target).size() === 0 ) {
module.hide();
event.stopImmediatePropagation();
}
},
debounce: function(method, delay) {
clearTimeout(module.timer);
module.timer = setTimeout(method, delay);
@ -141,7 +152,7 @@ $.fn.modal = function(parameters) {
}
},
resize: function() {
if( $dimmer.dimmer('is active') ) {
if( $dimmable.dimmer('is active') ) {
module.refresh();
}
}
@ -178,12 +189,17 @@ $.fn.modal = function(parameters) {
showDimmer: function() {
module.debug('Showing modal');
module.set.dimmerSettings();
$dimmer.dimmer('show');
$dimmable.dimmer('show');
},
hide: function() {
if( $dimmer.dimmer('is active') ) {
$dimmer.dimmer('hide');
if(settings.closable) {
$dimmer
.off('click' + eventNamespace)
;
}
if( $dimmable.dimmer('is active') ) {
$dimmable.dimmer('hide');
}
if( module.is.active() ) {
module.hideModal();
@ -196,7 +212,7 @@ $.fn.modal = function(parameters) {
hideDimmer: function() {
module.debug('Hiding dimmer');
$dimmer.dimmer('hide');
$dimmable.dimmer('hide');
},
hideModal: function() {
@ -261,7 +277,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.removeClass(className.scrolling);
$dimmable.removeClass(className.scrolling);
$module.removeClass(className.scrolling);
}
},
@ -271,7 +287,7 @@ $.fn.modal = function(parameters) {
height : $module.outerHeight() + settings.offset,
contextHeight : (settings.context == 'body')
? $(window).height()
: $dimmer.height()
: $dimmable.height()
};
module.debug('Caching modal and container sizes', module.cache);
},
@ -297,14 +313,13 @@ $.fn.modal = function(parameters) {
;
if(settings.closable) {
$dimmer
.dimmer('get dimmer')
.on('click', module.hide)
.on('click' + eventNamespace, module.event.click)
;
}
},
dimmerSettings: function() {
module.debug('Setting dimmer settings', $dimmer);
$dimmer
module.debug('Setting dimmer settings', $dimmable);
$dimmable
.dimmer('setting', 'closable', false)
.dimmer('setting', 'duration', {
show : settings.duration * 0.95,
@ -317,7 +332,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.addClass(className.scrolling);
$dimmable.addClass(className.scrolling);
$module.addClass(className.scrolling);
},
type: function() {

2
rtl/minified/modules/modal.min.js
View File

File diff suppressed because one or more lines are too long

2
rtl/packaged/css/semantic.min.css
View File

File diff suppressed because one or more lines are too long

41
rtl/packaged/javascript/semantic.js
View File

@ -5237,6 +5237,7 @@ $.fn.modal = function(parameters) {
$close = $module.find(selector.close),
$focusedElement,
$dimmable,
$dimmer,
element = this,
@ -5249,9 +5250,12 @@ $.fn.modal = function(parameters) {
initialize: function() {
module.verbose('Initializing dimmer', $context);
$dimmer = $context
$dimmable = $context
.dimmer('add content', $module)
;
$dimmer = $context
.dimmer('get dimmer')
;
module.verbose('Attaching close events', $close);
$close
@ -5312,6 +5316,13 @@ $.fn.modal = function(parameters) {
module.verbose('Close button pressed');
module.hide();
},
click: function(event) {
module.verbose('Determining if event occured on dimmer', event);
if( $dimmer.find(event.target).size() === 0 ) {
module.hide();
event.stopImmediatePropagation();
}
},
debounce: function(method, delay) {
clearTimeout(module.timer);
module.timer = setTimeout(method, delay);
@ -5328,7 +5339,7 @@ $.fn.modal = function(parameters) {
}
},
resize: function() {
if( $dimmer.dimmer('is active') ) {
if( $dimmable.dimmer('is active') ) {
module.refresh();
}
}
@ -5365,12 +5376,17 @@ $.fn.modal = function(parameters) {
showDimmer: function() {
module.debug('Showing modal');
module.set.dimmerSettings();
$dimmer.dimmer('show');
$dimmable.dimmer('show');
},
hide: function() {
if( $dimmer.dimmer('is active') ) {
$dimmer.dimmer('hide');
if(settings.closable) {
$dimmer
.off('click' + eventNamespace)
;
}
if( $dimmable.dimmer('is active') ) {
$dimmable.dimmer('hide');
}
if( module.is.active() ) {
module.hideModal();
@ -5383,7 +5399,7 @@ $.fn.modal = function(parameters) {
hideDimmer: function() {
module.debug('Hiding dimmer');
$dimmer.dimmer('hide');
$dimmable.dimmer('hide');
},
hideModal: function() {
@ -5448,7 +5464,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.removeClass(className.scrolling);
$dimmable.removeClass(className.scrolling);
$module.removeClass(className.scrolling);
}
},
@ -5458,7 +5474,7 @@ $.fn.modal = function(parameters) {
height : $module.outerHeight() + settings.offset,
contextHeight : (settings.context == 'body')
? $(window).height()
: $dimmer.height()
: $dimmable.height()
};
module.debug('Caching modal and container sizes', module.cache);
},
@ -5484,14 +5500,13 @@ $.fn.modal = function(parameters) {
;
if(settings.closable) {
$dimmer
.dimmer('get dimmer')
.on('click', module.hide)
.on('click' + eventNamespace, module.event.click)
;
}
},
dimmerSettings: function() {
module.debug('Setting dimmer settings', $dimmer);
$dimmer
module.debug('Setting dimmer settings', $dimmable);
$dimmable
.dimmer('setting', 'closable', false)
.dimmer('setting', 'duration', {
show : settings.duration * 0.95,
@ -5504,7 +5519,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.addClass(className.scrolling);
$dimmable.addClass(className.scrolling);
$module.addClass(className.scrolling);
},
type: function() {

4
rtl/packaged/javascript/semantic.min.js
View File

File diff suppressed because one or more lines are too long

41
rtl/uncompressed/modules/modal.js
View File

@ -50,6 +50,7 @@ $.fn.modal = function(parameters) {
$close = $module.find(selector.close),
$focusedElement,
$dimmable,
$dimmer,
element = this,
@ -62,9 +63,12 @@ $.fn.modal = function(parameters) {
initialize: function() {
module.verbose('Initializing dimmer', $context);
$dimmer = $context
$dimmable = $context
.dimmer('add content', $module)
;
$dimmer = $context
.dimmer('get dimmer')
;
module.verbose('Attaching close events', $close);
$close
@ -125,6 +129,13 @@ $.fn.modal = function(parameters) {
module.verbose('Close button pressed');
module.hide();
},
click: function(event) {
module.verbose('Determining if event occured on dimmer', event);
if( $dimmer.find(event.target).size() === 0 ) {
module.hide();
event.stopImmediatePropagation();
}
},
debounce: function(method, delay) {
clearTimeout(module.timer);
module.timer = setTimeout(method, delay);
@ -141,7 +152,7 @@ $.fn.modal = function(parameters) {
}
},
resize: function() {
if( $dimmer.dimmer('is active') ) {
if( $dimmable.dimmer('is active') ) {
module.refresh();
}
}
@ -178,12 +189,17 @@ $.fn.modal = function(parameters) {
showDimmer: function() {
module.debug('Showing modal');
module.set.dimmerSettings();
$dimmer.dimmer('show');
$dimmable.dimmer('show');
},
hide: function() {
if( $dimmer.dimmer('is active') ) {
$dimmer.dimmer('hide');
if(settings.closable) {
$dimmer
.off('click' + eventNamespace)
;
}
if( $dimmable.dimmer('is active') ) {
$dimmable.dimmer('hide');
}
if( module.is.active() ) {
module.hideModal();
@ -196,7 +212,7 @@ $.fn.modal = function(parameters) {
hideDimmer: function() {
module.debug('Hiding dimmer');
$dimmer.dimmer('hide');
$dimmable.dimmer('hide');
},
hideModal: function() {
@ -261,7 +277,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.removeClass(className.scrolling);
$dimmable.removeClass(className.scrolling);
$module.removeClass(className.scrolling);
}
},
@ -271,7 +287,7 @@ $.fn.modal = function(parameters) {
height : $module.outerHeight() + settings.offset,
contextHeight : (settings.context == 'body')
? $(window).height()
: $dimmer.height()
: $dimmable.height()
};
module.debug('Caching modal and container sizes', module.cache);
},
@ -297,14 +313,13 @@ $.fn.modal = function(parameters) {
;
if(settings.closable) {
$dimmer
.dimmer('get dimmer')
.on('click', module.hide)
.on('click' + eventNamespace, module.event.click)
;
}
},
dimmerSettings: function() {
module.debug('Setting dimmer settings', $dimmer);
$dimmer
module.debug('Setting dimmer settings', $dimmable);
$dimmable
.dimmer('setting', 'closable', false)
.dimmer('setting', 'duration', {
show : settings.duration * 0.95,
@ -317,7 +332,7 @@ $.fn.modal = function(parameters) {
;
},
scrolling: function() {
$dimmer.addClass(className.scrolling);
$dimmable.addClass(className.scrolling);
$module.addClass(className.scrolling);
},
type: function() {

Write Preview
Loading…
Cancel
Save