semantic-ui-rails 0.1.0.2 → 0.3.5

data/vendor/assets/javascripts/semantic-ui/modules/modal.js

@@ -17,19 +17,6 @@ $.fn.modal = function(parameters) {
     $window     = $(window),
     $document   = $(document),
 
-    settings    = ( $.isPlainObject(parameters) )
-      ? $.extend(true, {}, $.fn.modal.settings, parameters)
-      : $.fn.modal.settings,
-
-    selector        = settings.selector,
-    className       = settings.className,
-    namespace       = settings.namespace,
-    error           = settings.error,
-
-    eventNamespace  = '.' + namespace,
-    moduleNamespace = 'module-' + namespace,
-    moduleSelector  = $allModules.selector || '',
-
     time            = new Date().getTime(),
     performance     = [],
 
@@ -44,6 +31,19 @@ $.fn.modal = function(parameters) {
   $allModules
     .each(function() {
       var
+        settings    = ( $.isPlainObject(parameters) )
+          ? $.extend(true, {}, $.fn.modal.settings, parameters)
+          : $.fn.modal.settings,
+
+        selector        = settings.selector,
+        className       = settings.className,
+        namespace       = settings.namespace,
+        error           = settings.error,
+
+        eventNamespace  = '.' + namespace,
+        moduleNamespace = 'module-' + namespace,
+        moduleSelector  = $allModules.selector || '',
+
         $module      = $(this),
         $context     = $(settings.context),
         $otherModals = $allModules.not($module),
@@ -64,7 +64,6 @@ $.fn.modal = function(parameters) {
 
           $dimmer = $context
             .dimmer('add content', $module)
-            .dimmer('get dimmer')
           ;
 
           module.verbose('Attaching close events', $close);
@@ -107,7 +106,7 @@ $.fn.modal = function(parameters) {
           ;
           event = $.isFunction(module[event])
             ? module[event]
-            : module.show
+            : module.toggle
           ;
           if($toggle.size() > 0) {
             module.debug('Attaching modal events to element', selector, event);
@@ -124,7 +123,7 @@ $.fn.modal = function(parameters) {
         event: {
           close: function() {
             module.verbose('Close button pressed');
-            $context.dimmer('hide');
+            module.hide();
           },
           debounce: function(method, delay) {
             clearTimeout(module.timer);
@@ -137,12 +136,12 @@ $.fn.modal = function(parameters) {
             ;
             if(keyCode == escapeKey) {
               module.debug('Escape key pressed hiding modal');
-              $context.dimmer('hide');
+              module.hide();
               event.preventDefault();
             }
           },
           resize: function() {
-            if( $context.dimmer('is active') ) {
+            if( $dimmer.dimmer('is active') ) {
               module.refresh();
             }
           }
@@ -164,20 +163,12 @@ $.fn.modal = function(parameters) {
           module.hideAll();
           if(settings.transition && $.fn.transition !== undefined) {
             $module
-              .transition(settings.transition + ' in', settings.duration, function() {
-                module.set.active();
-                module.save.focus();
-                module.set.type();
-              })
+              .transition(settings.transition + ' in', settings.duration, module.set.active)
             ;
           }
           else {
             $module
-              .fadeIn(settings.duration, settings.easing, function() {
-                module.set.active();
-                module.save.focus();
-                module.set.type();
-              })
+              .fadeIn(settings.duration, settings.easing, module.set.active)
             ;
           }
           module.debug('Triggering dimmer');
@@ -187,18 +178,30 @@ $.fn.modal = function(parameters) {
         showDimmer: function() {
           module.debug('Showing modal');
           module.set.dimmerSettings();
-          $context.dimmer('show');
+          $dimmer.dimmer('show');
         },
+
+        hide: function() {
+          if( $dimmer.dimmer('is active') ) {
+            $dimmer.dimmer('hide');
+          }
+          if( module.is.active() ) {
+            module.hideModal();
+            $.proxy(settings.onHide, element)();
+          }
+          else {
+            module.debug('Cannot hide modal, modal is not visible');
+          }
+        },
+
         hideDimmer: function() {
-          $context.dimmer('hide');
+          module.debug('Hiding dimmer');
+          $dimmer.dimmer('hide');
         },
 
-        hide: function() {
+        hideModal: function() {
           module.debug('Hiding modal');
-          // remove keyboard detection
-          $document
-            .off('keyup.' + namespace)
-          ;
+          module.remove.keyboardShortcuts();
           if(settings.transition && $.fn.transition !== undefined) {
             $module
               .transition(settings.transition + ' out', settings.duration, function() {
@@ -215,7 +218,6 @@ $.fn.modal = function(parameters) {
               })
             ;
           }
-          $.proxy(settings.onHide, element)();
         },
 
         hideAll: function() {
@@ -242,7 +244,9 @@ $.fn.modal = function(parameters) {
 
         restore: {
           focus: function() {
-          $focusedElement.focus();
+            if($focusedElement.size() > 0) {
+              $focusedElement.focus();
+            }
           }
         },
 
@@ -267,7 +271,7 @@ $.fn.modal = function(parameters) {
             height        : $module.outerHeight() + settings.offset,
             contextHeight : (settings.context == 'body')
               ? $(window).height()
-              : $context.height()
+              : $dimmer.height()
           };
           module.debug('Caching modal and container sizes', module.cache);
         },
@@ -286,18 +290,28 @@ $.fn.modal = function(parameters) {
 
         set: {
           active: function() {
-            $module.addClass(className.active);
+            module.save.focus();
+            module.set.type();
+            $module
+              .addClass(className.active)
+            ;
+            if(settings.closable) {
+              $dimmer
+                .dimmer('get dimmer')
+                .on('click', module.hide)
+              ;
+            }
           },
           dimmerSettings: function() {
-            module.debug('Setting dimmer settings', settings.closable);
-            $context
-              .dimmer('setting', 'closable', settings.closable)
-              .dimmer('setting', 'duration', settings.duration * 0.75)
-              .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
-              .dimmer('setting', 'onHide', function() {
-                module.hide();
-                module.remove.keyboardShortcuts();
+            module.debug('Setting dimmer settings', $dimmer);
+            $dimmer
+              .dimmer('setting', 'closable', false)
+              .dimmer('setting', 'duration', {
+                show : settings.duration * 0.95,
+                hide : settings.duration * 1.05
               })
+              .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
+              // destory after changing settings in order to reattach events
               .dimmer('destroy')
               .dimmer('initialize')
             ;
@@ -526,7 +540,7 @@ $.fn.modal.settings = {
 
   closable    : true,
   context     : 'body',
-  duration    : 600,
+  duration    : 500,
   easing      : 'easeOutExpo',
   offset      : 0,
   transition  : 'scale',

data/vendor/assets/javascripts/semantic-ui/modules/nag.js

@@ -14,15 +14,6 @@
 $.fn.nag = function(parameters) {
   var
     $allModules     = $(this),
-    settings        = $.extend(true, {}, $.fn.nag.settings, parameters),
-
-    className       = settings.className,
-    selector        = settings.selector,
-    error           = settings.error,
-    namespace       = settings.namespace,
-
-    eventNamespace  = '.' + namespace,
-    moduleNamespace = namespace + '-module',
     moduleSelector  = $allModules.selector || '',
 
     time            = new Date().getTime(),
@@ -36,6 +27,16 @@ $.fn.nag = function(parameters) {
   $(this)
     .each(function() {
       var
+        settings        = $.extend(true, {}, $.fn.nag.settings, parameters),
+
+        className       = settings.className,
+        selector        = settings.selector,
+        error           = settings.error,
+        namespace       = settings.namespace,
+
+        eventNamespace  = '.' + namespace,
+        moduleNamespace = namespace + '-module',
+
         $module         = $(this),
 
         $close          = $module.find(selector.close),

data/vendor/assets/javascripts/semantic-ui/modules/popup.js

@@ -14,10 +14,7 @@
 $.fn.popup = function(parameters) {
   var
     $allModules     = $(this),
-
-    settings        = ( $.isPlainObject(parameters) )
-      ? $.extend(true, {}, $.fn.popup.settings, parameters)
-      : $.fn.popup.settings,
+    $document       = $(document),
 
     moduleSelector  = $allModules.selector || '',
 
@@ -33,6 +30,19 @@ $.fn.popup = function(parameters) {
   $allModules
     .each(function() {
       var
+        settings        = ( $.isPlainObject(parameters) )
+          ? $.extend(true, {}, $.fn.popup.settings, parameters)
+          : $.fn.popup.settings,
+
+        selector        = settings.selector,
+        className       = settings.className,
+        error           = settings.error,
+        metadata        = settings.metadata,
+        namespace       = settings.namespace,
+
+        eventNamespace  = '.' + settings.namespace,
+        moduleNamespace = settings.namespace + '-module',
+
         $module         = $(this),
 
         $window         = $(window),
@@ -43,15 +53,6 @@ $.fn.popup = function(parameters) {
 
         searchDepth     = 0,
 
-        eventNamespace  = '.' + settings.namespace,
-        moduleNamespace = settings.namespace + '-module',
-
-        selector        = settings.selector,
-        className       = settings.className,
-        error           = settings.error,
-        metadata        = settings.metadata,
-        namespace       = settings.namespace,
-
         element         = this,
         instance        = $module.data(moduleNamespace),
         module
@@ -154,18 +155,18 @@ $.fn.popup = function(parameters) {
               .html(html)
             ;
             if(settings.inline) {
-              module.verbose('Inserting popup element inline');
+              module.verbose('Inserting popup element inline', $popup);
               $popup
                 .insertAfter($module)
               ;
             }
             else {
-              module.verbose('Appending popup element to body');
+              module.verbose('Appending popup element to body', $popup);
               $popup
                 .appendTo( $('body') )
               ;
             }
-            $.proxy(settings.onInit, $popup)();
+            $.proxy(settings.onCreate, $popup)();
           }
           else {
             module.error(error.content);
@@ -204,6 +205,7 @@ $.fn.popup = function(parameters) {
                 left   : (popup.position.left < boundary.left)
               };
             }
+            module.verbose('Checking if outside viewable area', popup.position);
             // return only boundaries that have been surpassed
             $.each(offstage, function(direction, isOffstage) {
               if(isOffstage) {
@@ -259,7 +261,7 @@ $.fn.popup = function(parameters) {
             module.show();
           }
           else {
-            module.hide();
+            // module.hide();
           }
         },
 
@@ -291,9 +293,10 @@ $.fn.popup = function(parameters) {
           switch(position) {
             case 'top left':
               positioning = {
-                top    : 'auto',
                 bottom :  parentHeight - offset.top + settings.distanceAway,
-                left   : offset.left + arrowOffset
+                right  :  parentWidth - offset.left - width - arrowOffset,
+                top    : 'auto',
+                left   : 'auto'
               };
             break;
             case 'top center':
@@ -306,10 +309,9 @@ $.fn.popup = function(parameters) {
             break;
             case 'top right':
               positioning = {
-                bottom :  parentHeight - offset.top + settings.distanceAway,
-                right  :  parentWidth - offset.left - width - arrowOffset,
                 top    : 'auto',
-                left   : 'auto'
+                bottom :  parentHeight - offset.top + settings.distanceAway,
+                left   : offset.left + arrowOffset
               };
             break;
             case 'left center':
@@ -331,9 +333,9 @@ $.fn.popup = function(parameters) {
             case 'bottom left':
               positioning = {
                 top    :  offset.top + height + settings.distanceAway,
-                left   : offset.left + arrowOffset,
-                bottom : 'auto',
-                right  : 'auto'
+                right  : parentWidth - offset.left - width - arrowOffset,
+                left   : 'auto',
+                bottom : 'auto'
               };
             break;
             case 'bottom center':
@@ -347,9 +349,9 @@ $.fn.popup = function(parameters) {
             case 'bottom right':
               positioning = {
                 top    :  offset.top + height + settings.distanceAway,
-                right  : parentWidth - offset.left - width - arrowOffset,
-                left   : 'auto',
-                bottom : 'auto'
+                left   : offset.left + arrowOffset,
+                bottom : 'auto',
+                right  : 'auto'
               };
             break;
           }
@@ -359,11 +361,9 @@ $.fn.popup = function(parameters) {
           });
           // tentatively place on stage
           $popup
-            .removeAttr('style')
-            .removeClass('top right bottom left center')
             .css(positioning)
+            .removeClass(className.position)
             .addClass(position)
-            .addClass(className.loading)
           ;
           // check if is offstage
           offstagePosition = module.get.offstagePosition();
@@ -398,9 +398,6 @@ $.fn.popup = function(parameters) {
           $module
             .addClass(className.visible)
           ;
-          $popup
-            .removeClass(className.loading)
-          ;
           if(settings.transition && $.fn.transition !== undefined) {
             $popup
               .transition(settings.transition + ' in', settings.duration)
@@ -414,7 +411,7 @@ $.fn.popup = function(parameters) {
           }
           if(settings.on == 'click' && settings.clicktoClose) {
             module.debug('Binding popup close event');
-            $(document)
+            $document
               .on('click.' + namespace, module.gracefully.hide)
             ;
           }
@@ -436,22 +433,30 @@ $.fn.popup = function(parameters) {
             module.debug('Hiding pop-up');
             if(settings.transition && $.fn.transition !== undefined) {
               $popup
-                .transition(settings.transition + ' out', settings.duration)
+                .transition(settings.transition + ' out', settings.duration, module.reset)
               ;
             }
             else {
               $popup
                 .stop()
-                .fadeOut(settings.duration, settings.easing)
+                .fadeOut(settings.duration, settings.easing, module.reset)
               ;
             }
           }
           if(settings.on == 'click' && settings.clicktoClose) {
-            $(document)
+            $document
               .off('click.' + namespace)
             ;
           }
           $.proxy(settings.onHide, $popup)();
+        },
+
+        reset: function() {
+          module.verbose('Resetting inline styles');
+          $popup
+            .attr('style', '')
+            .removeAttr('style')
+          ;
           if(!settings.inline) {
             module.remove();
           }
@@ -653,7 +658,7 @@ $.fn.popup.settings = {
   performance    : true,
   namespace      : 'popup',
 
-  onInit         : function(){},
+  onCreate         : function(){},
   onShow         : function(){},
   onHide         : function(){},
 
@@ -695,7 +700,8 @@ $.fn.popup.settings = {
   className   : {
     popup       : 'ui popup',
     visible     : 'visible',
-    loading     : 'loading'
+    loading     : 'loading',
+    position    : 'top left center bottom right'
   },
 
   selector    : {