semantic-ui-sass 0.8.2.0 → 0.8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b23b21a8fc362e7175983258be1fd66db11628e
-  data.tar.gz: 7c324ad9aa03c5b716100d52290d9379cc10005d
+  metadata.gz: 4ec316c7e4a2d3d5b5add10dd55c077668e00597
+  data.tar.gz: d8e85bbde5a89f7053254973345530c06298735d
 SHA512:
-  metadata.gz: 5dca4f62ea6fcb91f4946186517554717ddbe0f75247074761bf07fc8ad498c691084e8810c237eb3ff0e03441ba9d82a44034f36bb420c04bc18919bddf20f0
-  data.tar.gz: a9c5f4c3cbe2ccedcf67b773cc0d67be5c1d621d73dcf255d3b0984a4c0ace25243fe81afc86adbe6f9987df30afbe92ee1915e7f8afe2f784ddac70229da1e2
+  metadata.gz: c78da212afb13d9efe088a4b8aa5af3b1eb2cd38a297006123cfb000dfdca2fcd89bad1ba0fa55f8566c69923d93336dbd7b6f988287cfcd000724d5b00fa474
+  data.tar.gz: 372bfb459e06db35b768cf5ecedd6640ba347a5eb98eed4e68d5323d41f0480f8b84a78ba0b14d8f7540a8ca16627cb19c0107ba23f7b5f550dfbe2c2145e379

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.3.0
+
+* Update Semantic UI to 0.8.3
+
+## 0.8.0.0
+
 ## 0.8.2.0
 
 * Update Semantic UI to 0.8.2

data/README.md

@@ -5,7 +5,7 @@
 ## Installation and Usage
 
 ```ruby
-gem 'semantic-ui-sass', '~> 0.8.2.0'
+gem 'semantic-ui-sass', '~> 0.8.3.0'
 ```
 or
 

data/app/assets/javascripts/semantic-ui/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/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/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.scss

@@ -214,10 +214,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"],

data/app/assets/stylesheets/semantic-ui/elements/_label.scss

@@ -46,6 +46,20 @@ a.ui.label {
   cursor: pointer;
 }
 
+/* Inside Link */
+
+.ui.label a {
+  cursor: pointer;
+  color: inherit;
+  opacity: 0.8;
+  -webkit-transition: 0.2s opacity ease;
+  transition: 0.2s opacity ease;
+}
+
+.ui.label a:hover {
+  opacity: 1;
+}
+
 /* Detail */
 
 .ui.label .detail {

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

@@ -1,8 +1,8 @@
 module Semantic
   module Ui
     module Sass
-      VERSION = "0.8.2.0"
-      SEMANTIC_UI_SHA = 'd58f65fa9eca42692d9f2aa1234b68f77b1d9812'
+      VERSION = "0.8.3.0"
+      SEMANTIC_UI_SHA = '26f96b2372f85e723e6c6679409467947806f683'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic-ui-sass
 version: !ruby/object:Gem::Version
-  version: 0.8.2.0
+  version: 0.8.3.0
 platform: ruby
 authors:
 - doabit
 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: bundler