updates version and builds packages

RELEASE NOTES.md

@@ -1,5 +1,13 @@
 ## RELEASE NOTES
 
+### Version 0.3.7 - Oct 8, 2013
+
+**Fixes**
+- Fixes modal show/hide action reversal in Webkit
+
+**Updates**
+- Dimmer can now take different durations for its show and hide
+
 ### Version 0.3.6 - Oct 7, 2013
 
 **Fixes**

build/less/modules/dimmer.js

@@ -151,7 +151,7 @@ $.fn.dimmer = function(parameters) {
             module.set.dimmed();
             if($.fn.transition !== undefined) {
               $dimmer
-                .transition(settings.transition + ' in', settings.duration, function() {
+                .transition(settings.transition + ' in', module.get.duration(), function() {
                   module.set.active();
                   callback();
                 })
@@ -166,7 +166,7 @@ $.fn.dimmer = function(parameters) {
                   width   : '100%',
                   height  : '100%'
                 })
-                .fadeTo(settings.duration, 1, function() {
+                .fadeTo(module.get.duration(), 1, function() {
                   $dimmer.removeAttr('style');
                   module.set.active();
                   callback();
@@ -180,7 +180,7 @@ $.fn.dimmer = function(parameters) {
             if($.fn.transition !== undefined) {
               module.verbose('Hiding dimmer with css');
               $dimmer
-                .transition(settings.transition + ' out', settings.duration, function() {
+                .transition(settings.transition + ' out', module.get.duration(), function() {
                   module.remove.active();
                   callback();
                 })
@@ -190,7 +190,7 @@ $.fn.dimmer = function(parameters) {
               module.verbose('Hiding dimmer with javascript');
               $dimmer
                 .stop()
-                .fadeOut(settings.duration, function() {
+                .fadeOut(module.get.duration(), function() {
                   $dimmer.removeAttr('style');
                   module.remove.active();
                   callback();
@@ -203,6 +203,17 @@ $.fn.dimmer = function(parameters) {
         get: {
           dimmer: function() {
             return $dimmer;
+          },
+          duration: function() {
+            if(typeof settings.duration == 'object') {
+              if( module.is.active() ) {
+                return settings.duration.hide;
+              }
+              else {
+                return settings.duration.show;
+              }
+            }
+            return settings.duration;
           }
         },
 
@@ -512,7 +523,10 @@ $.fn.dimmer.settings = {
 
   on          : false,
   closable    : true,
-  duration    : 500,
+  duration    : {
+    show : 500,
+    hide : 500
+  },
 
   onChange    : function(){},
   onShow      : function(){},

build/less/modules/modal.js

@@ -197,7 +197,7 @@ $.fn.modal = function(parameters) {
           module.debug('Hiding modal');
           // remove keyboard detection
           $document
-            .off('keyup.' + namespace)
+            .off('keyup.' + eventNamespace)
           ;
           if(settings.transition && $.fn.transition !== undefined) {
             $module
@@ -242,7 +242,7 @@ $.fn.modal = function(parameters) {
 
         restore: {
           focus: function() {
-          $focusedElement.focus();
+            $focusedElement.focus();
           }
         },
 
@@ -292,7 +292,10 @@ $.fn.modal = function(parameters) {
             module.debug('Setting dimmer settings', settings.closable);
             $context
               .dimmer('setting', 'closable', settings.closable)
-              .dimmer('setting', 'duration', settings.duration * 0.75)
+              .dimmer('setting', 'duration', {
+                show : settings.duration * 0.95,
+                hide : settings.duration * 1.05
+              })
               .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
               .dimmer('setting', 'onHide', function() {
                 module.hide();
@@ -526,7 +529,7 @@ $.fn.modal.settings = {
 
   closable    : true,
   context     : 'body',
-  duration    : 600,
+  duration    : 500,
   easing      : 'easeOutExpo',
   offset      : 0,
   transition  : 'scale',

build/minified/modules/dimmer.js

@@ -151,7 +151,7 @@ $.fn.dimmer = function(parameters) {
             module.set.dimmed();
             if($.fn.transition !== undefined) {
               $dimmer
-                .transition(settings.transition + ' in', settings.duration, function() {
+                .transition(settings.transition + ' in', module.get.duration(), function() {
                   module.set.active();
                   callback();
                 })
@@ -166,7 +166,7 @@ $.fn.dimmer = function(parameters) {
                   width   : '100%',
                   height  : '100%'
                 })
-                .fadeTo(settings.duration, 1, function() {
+                .fadeTo(module.get.duration(), 1, function() {
                   $dimmer.removeAttr('style');
                   module.set.active();
                   callback();
@@ -180,7 +180,7 @@ $.fn.dimmer = function(parameters) {
             if($.fn.transition !== undefined) {
               module.verbose('Hiding dimmer with css');
               $dimmer
-                .transition(settings.transition + ' out', settings.duration, function() {
+                .transition(settings.transition + ' out', module.get.duration(), function() {
                   module.remove.active();
                   callback();
                 })
@@ -190,7 +190,7 @@ $.fn.dimmer = function(parameters) {
               module.verbose('Hiding dimmer with javascript');
               $dimmer
                 .stop()
-                .fadeOut(settings.duration, function() {
+                .fadeOut(module.get.duration(), function() {
                   $dimmer.removeAttr('style');
                   module.remove.active();
                   callback();
@@ -203,6 +203,17 @@ $.fn.dimmer = function(parameters) {
         get: {
           dimmer: function() {
             return $dimmer;
+          },
+          duration: function() {
+            if(typeof settings.duration == 'object') {
+              if( module.is.active() ) {
+                return settings.duration.hide;
+              }
+              else {
+                return settings.duration.show;
+              }
+            }
+            return settings.duration;
           }
         },
 
@@ -512,7 +523,10 @@ $.fn.dimmer.settings = {
 
   on          : false,
   closable    : true,
-  duration    : 500,
+  duration    : {
+    show : 500,
+    hide : 500
+  },
 
   onChange    : function(){},
   onShow      : function(){},

build/minified/modules/modal.js

@@ -197,7 +197,7 @@ $.fn.modal = function(parameters) {
           module.debug('Hiding modal');
           // remove keyboard detection
           $document
-            .off('keyup.' + namespace)
+            .off('keyup.' + eventNamespace)
           ;
           if(settings.transition && $.fn.transition !== undefined) {
             $module
@@ -242,7 +242,7 @@ $.fn.modal = function(parameters) {
 
         restore: {
           focus: function() {
-          $focusedElement.focus();
+            $focusedElement.focus();
           }
         },
 
@@ -292,7 +292,10 @@ $.fn.modal = function(parameters) {
             module.debug('Setting dimmer settings', settings.closable);
             $context
               .dimmer('setting', 'closable', settings.closable)
-              .dimmer('setting', 'duration', settings.duration * 0.75)
+              .dimmer('setting', 'duration', {
+                show : settings.duration * 0.95,
+                hide : settings.duration * 1.05
+              })
               .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
               .dimmer('setting', 'onHide', function() {
                 module.hide();
@@ -526,7 +529,7 @@ $.fn.modal.settings = {
 
   closable    : true,
   context     : 'body',
-  duration    : 600,
+  duration    : 500,
   easing      : 'easeOutExpo',
   offset      : 0,
   transition  : 'scale',

build/packaged/javascript/semantic.js

@@ -4024,7 +4024,7 @@ $.fn.dimmer = function(parameters) {
             module.set.dimmed();
             if($.fn.transition !== undefined) {
               $dimmer
-                .transition(settings.transition + ' in', settings.duration, function() {
+                .transition(settings.transition + ' in', module.get.duration(), function() {
                   module.set.active();
                   callback();
                 })
@@ -4039,7 +4039,7 @@ $.fn.dimmer = function(parameters) {
                   width   : '100%',
                   height  : '100%'
                 })
-                .fadeTo(settings.duration, 1, function() {
+                .fadeTo(module.get.duration(), 1, function() {
                   $dimmer.removeAttr('style');
                   module.set.active();
                   callback();
@@ -4053,7 +4053,7 @@ $.fn.dimmer = function(parameters) {
             if($.fn.transition !== undefined) {
               module.verbose('Hiding dimmer with css');
               $dimmer
-                .transition(settings.transition + ' out', settings.duration, function() {
+                .transition(settings.transition + ' out', module.get.duration(), function() {
                   module.remove.active();
                   callback();
                 })
@@ -4063,7 +4063,7 @@ $.fn.dimmer = function(parameters) {
               module.verbose('Hiding dimmer with javascript');
               $dimmer
                 .stop()
-                .fadeOut(settings.duration, function() {
+                .fadeOut(module.get.duration(), function() {
                   $dimmer.removeAttr('style');
                   module.remove.active();
                   callback();
@@ -4076,6 +4076,17 @@ $.fn.dimmer = function(parameters) {
         get: {
           dimmer: function() {
             return $dimmer;
+          },
+          duration: function() {
+            if(typeof settings.duration == 'object') {
+              if( module.is.active() ) {
+                return settings.duration.hide;
+              }
+              else {
+                return settings.duration.show;
+              }
+            }
+            return settings.duration;
           }
         },
 
@@ -4385,7 +4396,10 @@ $.fn.dimmer.settings = {
 
   on          : false,
   closable    : true,
-  duration    : 500,
+  duration    : {
+    show : 500,
+    hide : 500
+  },
 
   onChange    : function(){},
   onShow      : function(){},
@@ -5344,7 +5358,7 @@ $.fn.modal = function(parameters) {
           module.debug('Hiding modal');
           // remove keyboard detection
           $document
-            .off('keyup.' + namespace)
+            .off('keyup.' + eventNamespace)
           ;
           if(settings.transition && $.fn.transition !== undefined) {
             $module
@@ -5389,7 +5403,7 @@ $.fn.modal = function(parameters) {
 
         restore: {
           focus: function() {
-          $focusedElement.focus();
+            $focusedElement.focus();
           }
         },
 
@@ -5439,7 +5453,10 @@ $.fn.modal = function(parameters) {
             module.debug('Setting dimmer settings', settings.closable);
             $context
               .dimmer('setting', 'closable', settings.closable)
-              .dimmer('setting', 'duration', settings.duration * 0.75)
+              .dimmer('setting', 'duration', {
+                show : settings.duration * 0.95,
+                hide : settings.duration * 1.05
+              })
               .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
               .dimmer('setting', 'onHide', function() {
                 module.hide();
@@ -5673,7 +5690,7 @@ $.fn.modal.settings = {
 
   closable    : true,
   context     : 'body',
-  duration    : 600,
+  duration    : 500,
   easing      : 'easeOutExpo',
   offset      : 0,
   transition  : 'scale',

build/uncompressed/modules/dimmer.js

@@ -151,7 +151,7 @@ $.fn.dimmer = function(parameters) {
             module.set.dimmed();
             if($.fn.transition !== undefined) {
               $dimmer
-                .transition(settings.transition + ' in', settings.duration, function() {
+                .transition(settings.transition + ' in', module.get.duration(), function() {
                   module.set.active();
                   callback();
                 })
@@ -166,7 +166,7 @@ $.fn.dimmer = function(parameters) {
                   width   : '100%',
                   height  : '100%'
                 })
-                .fadeTo(settings.duration, 1, function() {
+                .fadeTo(module.get.duration(), 1, function() {
                   $dimmer.removeAttr('style');
                   module.set.active();
                   callback();
@@ -180,7 +180,7 @@ $.fn.dimmer = function(parameters) {
             if($.fn.transition !== undefined) {
               module.verbose('Hiding dimmer with css');
               $dimmer
-                .transition(settings.transition + ' out', settings.duration, function() {
+                .transition(settings.transition + ' out', module.get.duration(), function() {
                   module.remove.active();
                   callback();
                 })
@@ -190,7 +190,7 @@ $.fn.dimmer = function(parameters) {
               module.verbose('Hiding dimmer with javascript');
               $dimmer
                 .stop()
-                .fadeOut(settings.duration, function() {
+                .fadeOut(module.get.duration(), function() {
                   $dimmer.removeAttr('style');
                   module.remove.active();
                   callback();
@@ -203,6 +203,17 @@ $.fn.dimmer = function(parameters) {
         get: {
           dimmer: function() {
             return $dimmer;
+          },
+          duration: function() {
+            if(typeof settings.duration == 'object') {
+              if( module.is.active() ) {
+                return settings.duration.hide;
+              }
+              else {
+                return settings.duration.show;
+              }
+            }
+            return settings.duration;
           }
         },
 
@@ -512,7 +523,10 @@ $.fn.dimmer.settings = {
 
   on          : false,
   closable    : true,
-  duration    : 500,
+  duration    : {
+    show : 500,
+    hide : 500
+  },
 
   onChange    : function(){},
   onShow      : function(){},

build/uncompressed/modules/modal.js

@@ -197,7 +197,7 @@ $.fn.modal = function(parameters) {
           module.debug('Hiding modal');
           // remove keyboard detection
           $document
-            .off('keyup.' + namespace)
+            .off('keyup.' + eventNamespace)
           ;
           if(settings.transition && $.fn.transition !== undefined) {
             $module
@@ -242,7 +242,7 @@ $.fn.modal = function(parameters) {
 
         restore: {
           focus: function() {
-          $focusedElement.focus();
+            $focusedElement.focus();
           }
         },
 
@@ -292,7 +292,10 @@ $.fn.modal = function(parameters) {
             module.debug('Setting dimmer settings', settings.closable);
             $context
               .dimmer('setting', 'closable', settings.closable)
-              .dimmer('setting', 'duration', settings.duration * 0.75)
+              .dimmer('setting', 'duration', {
+                show : settings.duration * 0.95,
+                hide : settings.duration * 1.05
+              })
               .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
               .dimmer('setting', 'onHide', function() {
                 module.hide();
@@ -526,7 +529,7 @@ $.fn.modal.settings = {
 
   closable    : true,
   context     : 'body',
-  duration    : 600,
+  duration    : 500,
   easing      : 'easeOutExpo',
   offset      : 0,
   transition  : 'scale',

node/package.json

@@ -1,7 +1,7 @@
 {
   "semantic": {
     "name": "Semantic UI",
-    "version": "0.3.5"
+    "version": "0.3.7"
   },
   "dependencies": {
     "docpad": "~6.53.1",

node/src/documents/index.html.eco

@@ -14,7 +14,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.3.6</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.3.7</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>

node/src/documents/modules/dimmer.html.eco

@@ -192,8 +192,15 @@ type        : 'UI Module'
       </tr>
       <tr>
         <td>duration</td>
-        <td>500</td>
-        <td>Duration of dimming animation.</td>
+        <td>
+          <div class="code">
+      duration    : {
+        show : 500,
+        hide : 500
+      },
+          </div>
+        </td>
+        <td>Animation duration of dimming. If an integer is used, that value will apply to both show and hide animations.</td>
       </tr>
     </tbody>
   </table>

node/src/files/build/less/modules/dimmer.js

@@ -151,7 +151,7 @@ $.fn.dimmer = function(parameters) {
             module.set.dimmed();
             if($.fn.transition !== undefined) {
               $dimmer
-                .transition(settings.transition + ' in', settings.duration, function() {
+                .transition(settings.transition + ' in', module.get.duration(), function() {
                   module.set.active();
                   callback();
                 })
@@ -166,7 +166,7 @@ $.fn.dimmer = function(parameters) {
                   width   : '100%',
                   height  : '100%'
                 })
-                .fadeTo(settings.duration, 1, function() {
+                .fadeTo(module.get.duration(), 1, function() {
                   $dimmer.removeAttr('style');
                   module.set.active();
                   callback();
@@ -180,7 +180,7 @@ $.fn.dimmer = function(parameters) {
             if($.fn.transition !== undefined) {
               module.verbose('Hiding dimmer with css');
               $dimmer
-                .transition(settings.transition + ' out', settings.duration, function() {
+                .transition(settings.transition + ' out', module.get.duration(), function() {
                   module.remove.active();
                   callback();
                 })
@@ -190,7 +190,7 @@ $.fn.dimmer = function(parameters) {
               module.verbose('Hiding dimmer with javascript');
               $dimmer
                 .stop()
-                .fadeOut(settings.duration, function() {
+                .fadeOut(module.get.duration(), function() {
                   $dimmer.removeAttr('style');
                   module.remove.active();
                   callback();
@@ -203,6 +203,17 @@ $.fn.dimmer = function(parameters) {
         get: {
           dimmer: function() {
             return $dimmer;
+          },
+          duration: function() {
+            if(typeof settings.duration == 'object') {
+              if( module.is.active() ) {
+                return settings.duration.hide;
+              }
+              else {
+                return settings.duration.show;
+              }
+            }
+            return settings.duration;
           }
         },
 
@@ -512,7 +523,10 @@ $.fn.dimmer.settings = {
 
   on          : false,
   closable    : true,
-  duration    : 500,
+  duration    : {
+    show : 500,
+    hide : 500
+  },
 
   onChange    : function(){},
   onShow      : function(){},

node/src/files/build/less/modules/modal.js

@@ -197,7 +197,7 @@ $.fn.modal = function(parameters) {
           module.debug('Hiding modal');
           // remove keyboard detection
           $document
-            .off('keyup.' + namespace)
+            .off('keyup.' + eventNamespace)
           ;
           if(settings.transition && $.fn.transition !== undefined) {
             $module
@@ -242,7 +242,7 @@ $.fn.modal = function(parameters) {
 
         restore: {
           focus: function() {
-          $focusedElement.focus();
+            $focusedElement.focus();
           }
         },
 
@@ -292,7 +292,10 @@ $.fn.modal = function(parameters) {
             module.debug('Setting dimmer settings', settings.closable);
             $context
               .dimmer('setting', 'closable', settings.closable)
-              .dimmer('setting', 'duration', settings.duration * 0.75)
+              .dimmer('setting', 'duration', {
+                show : settings.duration * 0.95,
+                hide : settings.duration * 1.05
+              })
               .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
               .dimmer('setting', 'onHide', function() {
                 module.hide();
@@ -526,7 +529,7 @@ $.fn.modal.settings = {
 
   closable    : true,
   context     : 'body',
-  duration    : 600,
+  duration    : 500,
   easing      : 'easeOutExpo',
   offset      : 0,
   transition  : 'scale',

node/src/files/build/minified/modules/dimmer.js

@@ -151,7 +151,7 @@ $.fn.dimmer = function(parameters) {
             module.set.dimmed();
             if($.fn.transition !== undefined) {
               $dimmer
-                .transition(settings.transition + ' in', settings.duration, function() {
+                .transition(settings.transition + ' in', module.get.duration(), function() {
                   module.set.active();
                   callback();
                 })
@@ -166,7 +166,7 @@ $.fn.dimmer = function(parameters) {
                   width   : '100%',
                   height  : '100%'
                 })
-                .fadeTo(settings.duration, 1, function() {
+                .fadeTo(module.get.duration(), 1, function() {
                   $dimmer.removeAttr('style');
                   module.set.active();
                   callback();
@@ -180,7 +180,7 @@ $.fn.dimmer = function(parameters) {
             if($.fn.transition !== undefined) {
               module.verbose('Hiding dimmer with css');
               $dimmer
-                .transition(settings.transition + ' out', settings.duration, function() {
+                .transition(settings.transition + ' out', module.get.duration(), function() {
                   module.remove.active();
                   callback();
                 })
@@ -190,7 +190,7 @@ $.fn.dimmer = function(parameters) {
               module.verbose('Hiding dimmer with javascript');
               $dimmer
                 .stop()
-                .fadeOut(settings.duration, function() {
+                .fadeOut(module.get.duration(), function() {
                   $dimmer.removeAttr('style');
                   module.remove.active();
                   callback();
@@ -203,6 +203,17 @@ $.fn.dimmer = function(parameters) {
         get: {
           dimmer: function() {
             return $dimmer;
+          },
+          duration: function() {
+            if(typeof settings.duration == 'object') {
+              if( module.is.active() ) {
+                return settings.duration.hide;
+              }
+              else {
+                return settings.duration.show;
+              }
+            }
+            return settings.duration;
           }
         },
 
@@ -512,7 +523,10 @@ $.fn.dimmer.settings = {
 
   on          : false,
   closable    : true,
-  duration    : 500,
+  duration    : {
+    show : 500,
+    hide : 500
+  },
 
   onChange    : function(){},
   onShow      : function(){},

node/src/files/build/minified/modules/modal.js

@@ -197,7 +197,7 @@ $.fn.modal = function(parameters) {
           module.debug('Hiding modal');
           // remove keyboard detection
           $document
-            .off('keyup.' + namespace)
+            .off('keyup.' + eventNamespace)
           ;
           if(settings.transition && $.fn.transition !== undefined) {
             $module
@@ -242,7 +242,7 @@ $.fn.modal = function(parameters) {
 
         restore: {
           focus: function() {
-          $focusedElement.focus();
+            $focusedElement.focus();
           }
         },
 
@@ -292,7 +292,10 @@ $.fn.modal = function(parameters) {
             module.debug('Setting dimmer settings', settings.closable);
             $context
               .dimmer('setting', 'closable', settings.closable)
-              .dimmer('setting', 'duration', settings.duration * 0.75)
+              .dimmer('setting', 'duration', {
+                show : settings.duration * 0.95,
+                hide : settings.duration * 1.05
+              })
               .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
               .dimmer('setting', 'onHide', function() {
                 module.hide();
@@ -526,7 +529,7 @@ $.fn.modal.settings = {
 
   closable    : true,
   context     : 'body',
-  duration    : 600,
+  duration    : 500,
   easing      : 'easeOutExpo',
   offset      : 0,
   transition  : 'scale',

node/src/files/build/packaged/javascript/semantic.js

@@ -4024,7 +4024,7 @@ $.fn.dimmer = function(parameters) {
             module.set.dimmed();
             if($.fn.transition !== undefined) {
               $dimmer
-                .transition(settings.transition + ' in', settings.duration, function() {
+                .transition(settings.transition + ' in', module.get.duration(), function() {
                   module.set.active();
                   callback();
                 })
@@ -4039,7 +4039,7 @@ $.fn.dimmer = function(parameters) {
                   width   : '100%',
                   height  : '100%'
                 })
-                .fadeTo(settings.duration, 1, function() {
+                .fadeTo(module.get.duration(), 1, function() {
                   $dimmer.removeAttr('style');
                   module.set.active();
                   callback();
@@ -4053,7 +4053,7 @@ $.fn.dimmer = function(parameters) {
             if($.fn.transition !== undefined) {
               module.verbose('Hiding dimmer with css');
               $dimmer
-                .transition(settings.transition + ' out', settings.duration, function() {
+                .transition(settings.transition + ' out', module.get.duration(), function() {
                   module.remove.active();
                   callback();
                 })
@@ -4063,7 +4063,7 @@ $.fn.dimmer = function(parameters) {
               module.verbose('Hiding dimmer with javascript');
               $dimmer
                 .stop()
-                .fadeOut(settings.duration, function() {
+                .fadeOut(module.get.duration(), function() {
                   $dimmer.removeAttr('style');
                   module.remove.active();
                   callback();
@@ -4076,6 +4076,17 @@ $.fn.dimmer = function(parameters) {
         get: {
           dimmer: function() {
             return $dimmer;
+          },
+          duration: function() {
+            if(typeof settings.duration == 'object') {
+              if( module.is.active() ) {
+                return settings.duration.hide;
+              }
+              else {
+                return settings.duration.show;
+              }
+            }
+            return settings.duration;
           }
         },
 
@@ -4385,7 +4396,10 @@ $.fn.dimmer.settings = {
 
   on          : false,
   closable    : true,
-  duration    : 500,
+  duration    : {
+    show : 500,
+    hide : 500
+  },
 
   onChange    : function(){},
   onShow      : function(){},
@@ -5344,7 +5358,7 @@ $.fn.modal = function(parameters) {
           module.debug('Hiding modal');
           // remove keyboard detection
           $document
-            .off('keyup.' + namespace)
+            .off('keyup.' + eventNamespace)
           ;
           if(settings.transition && $.fn.transition !== undefined) {
             $module
@@ -5389,7 +5403,7 @@ $.fn.modal = function(parameters) {
 
         restore: {
           focus: function() {
-          $focusedElement.focus();
+            $focusedElement.focus();
           }
         },
 
@@ -5439,7 +5453,10 @@ $.fn.modal = function(parameters) {
             module.debug('Setting dimmer settings', settings.closable);
             $context
               .dimmer('setting', 'closable', settings.closable)
-              .dimmer('setting', 'duration', settings.duration * 0.75)
+              .dimmer('setting', 'duration', {
+                show : settings.duration * 0.95,
+                hide : settings.duration * 1.05
+              })
               .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
               .dimmer('setting', 'onHide', function() {
                 module.hide();
@@ -5673,7 +5690,7 @@ $.fn.modal.settings = {
 
   closable    : true,
   context     : 'body',
-  duration    : 600,
+  duration    : 500,
   easing      : 'easeOutExpo',
   offset      : 0,
   transition  : 'scale',

node/src/files/build/uncompressed/modules/dimmer.js

@@ -151,7 +151,7 @@ $.fn.dimmer = function(parameters) {
             module.set.dimmed();
             if($.fn.transition !== undefined) {
               $dimmer
-                .transition(settings.transition + ' in', settings.duration, function() {
+                .transition(settings.transition + ' in', module.get.duration(), function() {
                   module.set.active();
                   callback();
                 })
@@ -166,7 +166,7 @@ $.fn.dimmer = function(parameters) {
                   width   : '100%',
                   height  : '100%'
                 })
-                .fadeTo(settings.duration, 1, function() {
+                .fadeTo(module.get.duration(), 1, function() {
                   $dimmer.removeAttr('style');
                   module.set.active();
                   callback();
@@ -180,7 +180,7 @@ $.fn.dimmer = function(parameters) {
             if($.fn.transition !== undefined) {
               module.verbose('Hiding dimmer with css');
               $dimmer
-                .transition(settings.transition + ' out', settings.duration, function() {
+                .transition(settings.transition + ' out', module.get.duration(), function() {
                   module.remove.active();
                   callback();
                 })
@@ -190,7 +190,7 @@ $.fn.dimmer = function(parameters) {
               module.verbose('Hiding dimmer with javascript');
               $dimmer
                 .stop()
-                .fadeOut(settings.duration, function() {
+                .fadeOut(module.get.duration(), function() {
                   $dimmer.removeAttr('style');
                   module.remove.active();
                   callback();
@@ -203,6 +203,17 @@ $.fn.dimmer = function(parameters) {
         get: {
           dimmer: function() {
             return $dimmer;
+          },
+          duration: function() {
+            if(typeof settings.duration == 'object') {
+              if( module.is.active() ) {
+                return settings.duration.hide;
+              }
+              else {
+                return settings.duration.show;
+              }
+            }
+            return settings.duration;
           }
         },
 
@@ -512,7 +523,10 @@ $.fn.dimmer.settings = {
 
   on          : false,
   closable    : true,
-  duration    : 500,
+  duration    : {
+    show : 500,
+    hide : 500
+  },
 
   onChange    : function(){},
   onShow      : function(){},

node/src/files/build/uncompressed/modules/modal.js

@@ -197,7 +197,7 @@ $.fn.modal = function(parameters) {
           module.debug('Hiding modal');
           // remove keyboard detection
           $document
-            .off('keyup.' + namespace)
+            .off('keyup.' + eventNamespace)
           ;
           if(settings.transition && $.fn.transition !== undefined) {
             $module
@@ -242,7 +242,7 @@ $.fn.modal = function(parameters) {
 
         restore: {
           focus: function() {
-          $focusedElement.focus();
+            $focusedElement.focus();
           }
         },
 
@@ -292,7 +292,10 @@ $.fn.modal = function(parameters) {
             module.debug('Setting dimmer settings', settings.closable);
             $context
               .dimmer('setting', 'closable', settings.closable)
-              .dimmer('setting', 'duration', settings.duration * 0.75)
+              .dimmer('setting', 'duration', {
+                show : settings.duration * 0.95,
+                hide : settings.duration * 1.05
+              })
               .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
               .dimmer('setting', 'onHide', function() {
                 module.hide();
@@ -526,7 +529,7 @@ $.fn.modal.settings = {
 
   closable    : true,
   context     : 'body',
-  duration    : 600,
+  duration    : 500,
   easing      : 'easeOutExpo',
   offset      : 0,
   transition  : 'scale',