semantic-ui-rails 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d34f1c794fca0e412350b36fd819cefb94084485
-  data.tar.gz: f1ed9d45ec916db2f10077bf0c939bd6e26e2ed4
+  metadata.gz: a5f93fd2fb3a88efdca7083aba97c00d77062cf8
+  data.tar.gz: c67f535c006305a9740124543ff1c9be218ab4cf
 SHA512:
-  metadata.gz: 00fba62ec741a97ba9fce64c9fa8bd3a2b1d8583a6f99a36ecf6b77ebb8352af19f81211d870cfbdbe527114f4e16d675a613dd4fa0e1860db96e6a205c1e649
-  data.tar.gz: ef5f8e855802eb6f4e37d2aa9edd0395d44c96cf53fffdd141f1de7d1f86d5e3f2cdfc9f4c9238905ba6ab990dd07707d1e6f2049b5465c2b51bf859fe22c9dd
+  metadata.gz: 054488aee4ca61a0ab9b0ec3f4c4cb5db70f68f18ca182485bb1b1e69528ff7b72c28dc9782e6f88df9a55e4ec8ab441dccd3e3e167feb59363386dba4e1942f
+  data.tar.gz: c70999b03309f54c9013a0fee8c9b3ce7ea7d21b46465634ffd3d1131f817f555b127b7aeb4f9b5d7199bdfd72e793f76caafccfc7cbed26546e13a4f0f8dd61

data/app/assets/javascripts/semantic-ui/modules/behavior/form.js

@@ -360,7 +360,7 @@ $.fn.form = function(fields, parameters) {
             var
               $field        = module.get.field(field.identifier),
               type          = validation.type,
-              value         = $field.val(),
+              value         = $field.val() + '',
 
               bracketRegExp = /\[(.*?)\]/i,
               bracket       = bracketRegExp.exec(type),
@@ -370,7 +370,7 @@ $.fn.form = function(fields, parameters) {
             ;
             // if bracket notation is used, pass in extra parameters
             if(bracket !== undefined && bracket !== null) {
-              ancillary    = bracket[1];
+              ancillary    = '' + bracket[1];
               functionType = type.replace(bracket[0], '');
               isValid      = $.proxy(settings.rules[functionType], $module)(value, ancillary);
             }
@@ -652,6 +652,7 @@ $.fn.form.settings = {
       return (value != notValue);
     },
     contains: function(value, text) {
+      text = text.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
       return (value.search(text) !== -1);
     },
     is: function(value, text) {

data/app/assets/javascripts/semantic-ui/modules/dimmer.js

@@ -476,12 +476,12 @@ $.fn.dimmer = function(parameters) {
                 ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
                 : query
               ;
-              if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
-                instance = instance[value];
-              }
-              else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+              if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
                 instance = instance[camelCaseValue];
               }
+              else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+                instance = instance[value];
+              }
               else if( instance[value] !== undefined ) {
                 found = instance[value];
                 return false;

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

@@ -46,9 +46,10 @@ $.fn.modal = function(parameters) {
 
         $module      = $(this),
         $context     = $(settings.context),
-        $otherModals = $allModules.not($module),
         $close       = $module.find(selector.close),
 
+        $allModals,
+        $otherModals,
         $focusedElement,
         $dimmable,
         $dimmer,
@@ -80,12 +81,15 @@ $.fn.modal = function(parameters) {
             .dimmer('get dimmer')
           ;
 
+          $otherModals = $module.siblings(selector.modal);
+          $allModals   = $otherModals.add($module);
+
           module.verbose('Attaching close events', $close);
           $close
             .on('click' + eventNamespace, module.event.close)
           ;
           $window
-            .on('resize', function() {
+            .on('resize' + eventNamespace, function() {
               module.event.debounce(module.refresh, 50);
             })
           ;
@@ -165,9 +169,9 @@ $.fn.modal = function(parameters) {
             }
           },
           click: function(event) {
-            module.verbose('Determining if event occured on dimmer', event);
-            if( $dimmer.find(event.target).size() === 0 ) {
-              module.hide();
+            if( $(event.target).closest(selector.modal).size() === 0 ) {
+              module.debug('Dimmer clicked, hiding all modals');
+              module.hideAll();
               event.stopImmediatePropagation();
             }
           },
@@ -207,79 +211,145 @@ $.fn.modal = function(parameters) {
           }
         },
 
-        show: function() {
+        show: function(callback) {
+          callback = $.isFunction(callback)
+            ? callback
+            : function(){}
+          ;
           module.showDimmer();
-          module.cacheSizes();
-          module.set.position();
-          module.hideAll();
-          if(settings.transition && $.fn.transition !== undefined) {
-            $module
-              .transition(settings.transition + ' in', settings.duration, module.set.active)
-            ;
+          module.showModal(callback);
+        },
+
+        showModal: function(callback) {
+          callback = $.isFunction(callback)
+            ? callback
+            : function(){}
+          ;
+          if( !module.is.active() ) {
+            module.debug('Showing modal');
+            module.cacheSizes();
+            module.set.position();
+
+            if( $otherModals.filter(':visible').size() > 0 ) {
+              module.debug('Other modals visible, queueing show animation');
+              module.hideOthers(module.showModal);
+            }
+            else {
+              if(settings.transition && $.fn.transition !== undefined) {
+                $module
+                  .transition(settings.transition + ' in', settings.duration, function() {
+                    module.set.active();
+                    callback();
+                  })
+                ;
+              }
+              else {
+                $module
+                  .fadeIn(settings.duration, settings.easing, function() {
+                    module.set.active();
+                    callback();
+                  })
+                ;
+              }
+              $.proxy(settings.onShow, element)();
+            }
           }
           else {
-            $module
-              .fadeIn(settings.duration, settings.easing, module.set.active)
-            ;
+            module.debug('Modal is already visible');
           }
-          module.debug('Triggering dimmer');
-          $.proxy(settings.onShow, element)();
         },
 
         showDimmer: function() {
-          module.debug('Showing modal');
-          $dimmable.dimmer('show');
+          if( !$dimmable.dimmer('is active') ) {
+            module.debug('Showing dimmer');
+            $dimmable.dimmer('show');
+          }
+          else {
+            module.debug('Dimmer already visible');
+          }
         },
 
-        hide: function() {
-          if(settings.closable) {
-            $dimmer
-              .off('click' + eventNamespace)
-            ;
-          }
+        hide: function(callback) {
+          callback = $.isFunction(callback)
+            ? callback
+            : function(){}
+          ;
+          module.hideDimmer();
+          module.hideModal(callback);
+        },
+
+        hideDimmer: function() {
           if( $dimmable.dimmer('is active') ) {
+            module.debug('Hiding dimmer');
+            if(settings.closable) {
+              $dimmer
+                .off('click' + eventNamespace)
+              ;
+            }
             $dimmable.dimmer('hide');
           }
-          if( module.is.active() ) {
-            module.hideModal();
-            $.proxy(settings.onHide, element)();
-          }
           else {
-            module.debug('Cannot hide modal, modal is not visible');
+            module.debug('Dimmer is not visible cannot hide');
           }
         },
 
-        hideDimmer: function() {
-          module.debug('Hiding dimmer');
-          $dimmable.dimmer('hide');
+        hideModal: function(callback) {
+          callback = $.isFunction(callback)
+            ? callback
+            : function(){}
+          ;
+          if( module.is.active() ) {
+            module.debug('Hiding modal');
+            module.remove.keyboardShortcuts();
+            if(settings.transition && $.fn.transition !== undefined) {
+              $module
+                .transition(settings.transition + ' out', settings.duration, function() {
+                  module.remove.active();
+                  module.restore.focus();
+                  callback();
+                })
+              ;
+            }
+            else {
+              $module
+                .fadeOut(settings.duration, settings.easing, function() {
+                  module.remove.active();
+                  module.restore.focus();
+                  callback();
+                })
+              ;
+            }
+            $.proxy(settings.onHide, element)();
+          }
         },
 
-        hideModal: function() {
-          module.debug('Hiding modal');
-          module.remove.keyboardShortcuts();
-          if(settings.transition && $.fn.transition !== undefined) {
-            $module
-              .transition(settings.transition + ' out', settings.duration, function() {
-                module.remove.active();
-                module.restore.focus();
-              })
-            ;
-          }
-          else {
-            $module
-              .fadeOut(settings.duration, settings.easing, function() {
-                module.remove.active();
-                module.restore.focus();
-              })
+        hideAll: function(callback) {
+          callback = $.isFunction(callback)
+            ? callback
+            : function(){}
+          ;
+          if( $allModals.is(':visible') ) {
+            module.debug('Hiding all visible modals');
+            module.hideDimmer();
+            $allModals
+              .filter(':visible')
+                .modal('hide modal', callback)
             ;
           }
         },
 
-        hideAll: function() {
-          $otherModals
-            .filter(':visible')
-            .modal('hide')
+        hideOthers: function(callback) {
+          callback = $.isFunction(callback)
+            ? callback
+            : function(){}
           ;
+          if( $otherModals.is(':visible') ) {
+            module.debug('Hiding other modals');
+            $otherModals
+              .filter(':visible')
+                .modal('hide modal', callback)
+            ;
+          }
         },
 
         add: {
@@ -357,6 +427,7 @@ $.fn.modal = function(parameters) {
             ;
             if(settings.closable) {
               $dimmer
+                .off('click' + eventNamespace)
                 .on('click' + eventNamespace, module.event.click)
               ;
             }
@@ -511,20 +582,20 @@ $.fn.modal = function(parameters) {
                 ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
                 : query
               ;
-              if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
-                instance = instance[value];
-              }
-              else if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
+              if( $.isPlainObject( instance[camelCaseValue] ) && (depth != maxDepth) ) {
                 instance = instance[camelCaseValue];
               }
-              else if( instance[value] !== undefined ) {
-                found = instance[value];
-                return false;
-              }
               else if( instance[camelCaseValue] !== undefined ) {
                 found = instance[camelCaseValue];
                 return false;
               }
+              else if( $.isPlainObject( instance[value] ) && (depth != maxDepth) ) {
+                instance = instance[value];
+              }
+              else if( instance[value] !== undefined ) {
+                found = instance[value];
+                return false;
+              }
               else {
                 module.error(error.method);
                 return false;
@@ -595,7 +666,8 @@ $.fn.modal.settings = {
   selector    : {
     close    : '.close, .actions .button',
     approve  : '.actions .positive, .actions .approve',
-    deny     : '.actions .negative, .actions .cancel'
+    deny     : '.actions .negative, .actions .cancel',
+    modal    : '.ui.modal'
   },
   error : {
     dimmer    : 'UI Dimmer, a required component is not included in this page',

data/app/assets/stylesheets/semantic-ui/collections/form.less

@@ -246,9 +246,18 @@
 
 /* On Field(s) */
 .ui.form .fields.error .field label,
-.ui.form .field.error label {
+.ui.form .field.error label,
+.ui.form .fields.error .field .input,
+.ui.form .field.error .input {
   color: #D95C5C;
 }
+
+.ui.form .fields.error .field .corner.label,
+.ui.form .field.error .corner.label {
+  border-color: #D95C5C;
+  color: #FFFFFF;
+}
+
 .ui.form .fields.error .field textarea,
 .ui.form .fields.error .field input[type="text"],
 .ui.form .fields.error .field input[type="email"],
@@ -276,7 +285,6 @@
   -webkit-box-shadow: 0.3em 0em 0em 0em #D95C5C inset;
   -moz-box-shadow: 0.3em 0em 0em 0em #D95C5C inset;
   box-shadow: 0.3em 0em 0em 0em #D95C5C inset;
-
 }
 .ui.form .field.error textarea:focus,
 .ui.form .field.error input[type="text"]:focus,

data/app/assets/stylesheets/semantic-ui/elements/label.less

@@ -67,6 +67,17 @@ a.ui.label {
   cursor: pointer;
 }
 
+/* Inside Link */
+.ui.label a {
+  cursor: pointer;
+  color: inherit;
+  opacity: 0.8;
+  transition: 0.2s opacity ease;
+}
+.ui.label a:hover {
+  opacity: 1;
+}
+
 /* Detail */
 .ui.label .detail {
   display: inline-block;

data/lib/semantic/ui/rails/version.rb

@@ -1,7 +1,7 @@
 module Semantic
   module Ui
     module Rails
-      VERSION = "0.8.2"
+      VERSION = "0.8.3"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic-ui-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - nd0ut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: less-rails