less-rails-semantic_ui 2.0.5.0 → 2.0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6043f6d657f70a569013de645d25f633eb94818
-  data.tar.gz: 928a195ad0e62cffba28b1bf6f4f8a8b0fba77e7
+  metadata.gz: dbf4e1ce235b9e59cd0525fbf78a1e96ea4fe99b
+  data.tar.gz: 6b93df85deadfdac5827a014aa748e5ffe1fa42c
 SHA512:
-  metadata.gz: 097b718c2457ac4e48ee128dd94153cfc6042d0d316422026f38fd8545207ea68988d4e0ff7ef7abcfdff38e5a3a55e7c104b9a6e1953988505198efde538cbe
-  data.tar.gz: 84c0c7b9217e47e22764b109678f9a550fe107b7132f3e1623ce7fd1bb39f45e31574c72c9cefdb5c38b518ca6b4dd5c071c98e16b7ad708f7343e5b1c4811b7
+  metadata.gz: 50678692bb0a499e35b5b51ccccec0935e1e089486ab8f9ed20b7eaf8f07215d9d0b23a8d3d17e3a5eb39e8411b3f002e1a4114bd28786df3a6c6a5180e2aa6c
+  data.tar.gz: 2675e2b3a622029103ef975c6d7eff5057d9b9d720c80263e01a64b232b0316277c2372848719eb65ad548b4172be8827723c6a8a5bf5a401f8c927ba54c9145

data/assets/javascripts/semantic_ui/definitions/behaviors/form.js

@@ -1191,22 +1191,30 @@ $.fn.form.settings = {
       return (value.search( new RegExp(text) ) === -1);
     },
 
-    // is exactly length
-    length: function(value, requiredLength) {
+    // is at least string length
+    minLength: function(value, requiredLength) {
       return (value !== undefined)
-        ? (value.length == requiredLength)
+        ? (value.length >= requiredLength)
         : false
       ;
     },
 
-    // is at least string length
-    minLength: function(value, requiredLength) {
+    // see rls notes for 2.0.6 (this is a duplicate of minLength)
+    length: function(value, requiredLength) {
       return (value !== undefined)
         ? (value.length >= requiredLength)
         : false
       ;
     },
 
+    // is exactly length
+    exactLength: function(value, requiredLength) {
+      return (value !== undefined)
+        ? (value.length == requiredLength)
+        : false
+      ;
+    },
+
     // is less than length
     maxLength: function(value, maxLength) {
       return (value !== undefined)

data/assets/javascripts/semantic_ui/definitions/modules/dropdown.js

@@ -603,7 +603,7 @@ $.fn.dropdown = function(parameters) {
               }
             }
           ;
-          if(module.has.maxSelections()) {
+          if(settings.useLabels && module.has.maxSelections()) {
             return;
           }
           if(settings.apiSettings) {
@@ -1325,12 +1325,14 @@ $.fn.dropdown = function(parameters) {
               ? value
               : text
             ;
-            module.set.selected(value, $(this));
-            if(module.is.multiple() && !module.is.allFiltered()) {
-              return;
-            }
-            else {
-              module.hideAndClear();
+            if( module.can.activate( $(this) ) ) {
+              module.set.selected(value, $(this));
+              if(module.is.multiple() && !module.is.allFiltered()) {
+                return;
+              }
+              else {
+                module.hideAndClear();
+              }
             }
           },
 
@@ -1369,9 +1371,10 @@ $.fn.dropdown = function(parameters) {
           },
           selectionCount: function() {
             var
-              values = module.get.values()
+              values = module.get.values(),
+              count
             ;
-            return ( module.is.multiple() )
+            count = ( module.is.multiple() )
               ? $.isArray(values)
                 ? values.length
                 : 0
@@ -1379,6 +1382,7 @@ $.fn.dropdown = function(parameters) {
                 ? 1
                 : 0
             ;
+            return count;
           },
           transition: function($subMenu) {
             return (settings.transition == 'auto')
@@ -1441,10 +1445,16 @@ $.fn.dropdown = function(parameters) {
             };
           },
           value: function() {
-            return ($input.length > 0)
-              ? $input.val()
-              : $module.data(metadata.value)
+            var
+              value = ($input.length > 0)
+                ? $input.val()
+                : $module.data(metadata.value)
             ;
+            // prevents placeholder element from being selected when multiple
+            if($.isArray(value) && value.length === 1 && value[0] === '') {
+              return '';
+            }
+            return value;
           },
           values: function() {
             var
@@ -1672,8 +1682,10 @@ $.fn.dropdown = function(parameters) {
               ;
               if(selectionCount >= settings.maxSelections) {
                 module.debug('Maximum selection count reached');
-                $item.addClass(className.filtered);
-                module.add.message(message.maxSelections);
+                if(settings.useLabels) {
+                  $item.addClass(className.filtered);
+                  module.add.message(message.maxSelections);
+                }
                 return true;
               }
               else {
@@ -2099,7 +2111,6 @@ $.fn.dropdown = function(parameters) {
                 module.debug('Adding user option', value);
                 module.add.optionValue(value);
               }
-
               module.debug('Updating input value', value, currentValue);
               $input
                 .val(value)
@@ -2130,6 +2141,11 @@ $.fn.dropdown = function(parameters) {
           visible: function() {
             $module.addClass(className.visible);
           },
+          exactly: function(value, $selectedItem) {
+            module.debug('Setting selected to exact values');
+            module.clear();
+            module.set.selected(value, $selectedItem);
+          },
           selected: function(value, $selectedItem) {
             var
               isMultiple = module.is.multiple(),
@@ -2176,8 +2192,8 @@ $.fn.dropdown = function(parameters) {
                       module.select.nextAvailable($selectedItem);
                     }
                     else {
-                      module.set.text(module.add.variables(message.count));
                       module.add.value(selectedValue, selectedText, $selected);
+                      module.set.text(module.add.variables(message.count));
                       $selected.addClass(className.active);
                     }
                   }
@@ -2295,7 +2311,7 @@ $.fn.dropdown = function(parameters) {
               hasUserSuggestion = $addition.length > 0,
               html
             ;
-            if(module.has.maxSelections()) {
+            if(settings.useLabels && module.has.maxSelections()) {
               return;
             }
             if(value === '' || alreadyHasValue) {
@@ -2412,7 +2428,7 @@ $.fn.dropdown = function(parameters) {
             $item.removeClass(className.active);
           },
           filteredItem: function() {
-            if( module.has.maxSelections() ) {
+            if(settings.useLabels && module.has.maxSelections() ) {
               return;
             }
             if(settings.useLabels) {
@@ -2529,26 +2545,13 @@ $.fn.dropdown = function(parameters) {
             module.verbose('Removed value from delimited string', removedValue, values);
             return values;
           },
-          label: function(value) {
+          label: function(value, shouldAnimate) {
             var
               $labels       = $module.find(selector.label),
-              $removedLabel = $labels.filter('[data-value="' + value +'"]'),
-              labelCount    = $labels.length,
-              isLastLabel   = ($labels.index($removedLabel) + 1 == labelCount),
-              shouldAnimate = ( (!module.is.searchSelection() || !module.is.focusedOnSearch()) && isLastLabel)
-            ;
-            if(shouldAnimate) {
-              module.verbose('Animating and removing label', $removedLabel);
-              $removedLabel
-                .transition(settings.label.transition, settings.label.duration, function() {
-                  $removedLabel.remove();
-                })
-              ;
-            }
-            else {
-              module.verbose('Removing label', $removedLabel);
-              $removedLabel.remove();
-            }
+              $removedLabel = $labels.filter('[data-value="' + value +'"]')
+            ;
+            module.verbose('Removing label', $removedLabel);
+            $removedLabel.remove();
           },
           activeLabels: function($activeLabels) {
             $activeLabels = $activeLabels || $module.find(selector.label).filter('.' + className.active);
@@ -2669,7 +2672,7 @@ $.fn.dropdown = function(parameters) {
             ;
           },
           disabled: function() {
-            $module.hasClass(className.disabled);
+            return $module.hasClass(className.disabled);
           },
           focused: function() {
             return (document.activeElement === $module[0]);
@@ -2778,6 +2781,18 @@ $.fn.dropdown = function(parameters) {
         },
 
         can: {
+          activate: function($item) {
+            if(settings.useLabels) {
+              return true;
+            }
+            if(!module.has.maxSelections()) {
+              return true;
+            }
+            if(module.has.maxSelections() && $item.hasClass(className.active)) {
+              return true;
+            }
+            return false;
+          },
           click: function() {
             return (hasTouch || settings.on == 'click');
           },

data/assets/stylesheets/semantic_ui/definitions/elements/list.less

@@ -137,9 +137,12 @@ ol.ui.list ol li,
   display: table-cell;
   background-color: transparent;
   margin: 0em;
-  padding-right: @imageDistance;
   vertical-align: @imageAlign;
 }
+.ui.list .list > .item > .image:not(:only-child):not(img),
+.ui.list > .item > .image:not(:only-child):not(img) {
+  padding-right: @imageDistance;
+}
 .ui.list .list > .item > .image img,
 .ui.list > .item > .image img {
   vertical-align: @imageAlign;
@@ -150,7 +153,6 @@ ol.ui.list ol li,
 .ui.list > .item > img.image,
 .ui.list > .item > .image:only-child {
   display: inline-block;
-  padding-right: 0em;
 }
 
 /* Content */

data/lib/less/rails/semantic_ui/version.rb

@@ -1,7 +1,7 @@
 module Less
   module Rails
     module SemanticUI
-      VERSION = '2.0.5.0'
+      VERSION = '2.0.6.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: less-rails-semantic_ui
 version: !ruby/object:Gem::Version
-  version: 2.0.5.0
+  version: 2.0.6.0
 platform: ruby
 authors:
 - Maxim Dobryakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: less-rails