less-rails-semantic_ui 1.1.2.0 → 1.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ca3f94a11aa4bfbd455620d9de024a2f245d1a5
-  data.tar.gz: 97c8a561b7d08ee88361b07147993b0f3a0ec90d
+  metadata.gz: c67e7f81931898989959fe03c57a3bbb3d419456
+  data.tar.gz: ff263f25b36c3b9ecba87e5c0f78427e041d2437
 SHA512:
-  metadata.gz: c83e51df4988a240a38ab11b74a2a2a799d44d73e4477298ecbd792c74bccc991f6081691668290fb26389777aa1d17910ec7d53a35e8ff8d58721cbb3081474
-  data.tar.gz: 73c4cd5660d0a1434509c13f99a81182dc6b11b12469d91fd0493e49b903becc2f8aa06275526b9f7855907e5f7a54a326a885ca3dd1af2169d331b80862f538
+  metadata.gz: 2b4659771cff917502d5510281ccfed93361a953a354dedfd1bbdcab528fa1e706dc3272ad1727df8d43091305d2b89d5eebd03f4d87b438a503a7b00311ed69
+  data.tar.gz: 848a2a23361e230b1c9cd68d52ad6d1705407baeab00c38305fd9994b5cf0b408cbc8ce43f235448ddbf839096ad5814a6916fa4c4c71cf4a525802f05099a0e

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

@@ -398,7 +398,11 @@ $.fn.form = function(fields, parameters) {
               fieldValid  = true,
               fieldErrors = []
             ;
-            if(field.rules !== undefined) {
+            if(field.optional && $.trim($field.val()) === ''){
+              module.debug('Field is optional and empty. Skipping', field.identifier);
+              fieldValid = true;
+            }
+            else if(field.rules !== undefined) {
               $.each(field.rules, function(index, rule) {
                 if( module.has.field(field.identifier) && !( module.validate.rule(field, rule) ) ) {
                   module.debug('Field is invalid', field.identifier, rule.type);
@@ -643,7 +647,7 @@ $.fn.form.settings = {
   revalidate        : true,
 
   transition        : 'scale',
-  duration          : 150,
+  duration          : 200,
 
 
   onValid           : function() {},
@@ -669,15 +673,13 @@ $.fn.form.settings = {
     error   : 'error',
     success : 'success',
     down    : 'down',
-    label   : 'ui label prompt'
+    label   : 'ui prompt label'
   },
 
-  // errors
   error: {
     method   : 'The method you called is not defined.'
   },
 
-
   templates: {
     error: function(errors) {
       var
@@ -698,40 +700,77 @@ $.fn.form.settings = {
   },
 
   rules: {
+
+    // checkbox checked
     checked: function() {
       return ($(this).filter(':checked').size() > 0);
     },
-    empty: function(value) {
-      return !(value === undefined || '' === value);
+
+    // value contains (text)
+    contains: function(value, text) {
+      text = text.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+      return (value.search(text) !== -1);
     },
+
+    // is most likely an email
     email: function(value){
       var
         emailRegExp = new RegExp("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?", "i")
       ;
       return emailRegExp.test(value);
     },
-    length: function(value, requiredLength) {
-      return (value !== undefined)
-        ? (value.length >= requiredLength)
-        : false
-      ;
-    },
-    not: function(value, notValue) {
-      return (value != notValue);
+
+    // is not empty or blank string
+    empty: function(value) {
+      return !(value === undefined || '' === value);
     },
-    contains: function(value, text) {
-      text = text.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-      return (value.search(text) !== -1);
+
+    // is valid integer
+    integer: function(value, range) {
+      var
+        intRegExp = /^\-?\d+$/,
+        min,
+        max,
+        parts
+      ;
+      if (range === undefined || range === '' || range === '..') {
+        // do nothing
+      }
+      else if (range.indexOf('..') == -1) {
+        if (intRegExp.test(range)) {
+          min = max = range - 0;
+        }
+      }
+      else {
+        parts = range.split('..', 2);
+        if (intRegExp.test(parts[0])) {
+          min = parts[0] - 0;
+        }
+        if (intRegExp.test(parts[1])) {
+          max = parts[1] - 0;
+        }
+      }
+      return (
+        intRegExp.test(value) &&
+        (min === undefined || value >= min) &&
+        (max === undefined || value <= max)
+      );
     },
+
+    // is exactly value
     is: function(value, text) {
       return (value == text);
     },
-    maxLength: function(value, maxLength) {
+
+    // is at least string length
+    length: function(value, requiredLength) {
       return (value !== undefined)
-        ? (value.length <= maxLength)
+        ? (value.length >= requiredLength)
         : false
       ;
     },
+
+    // matches another field
     match: function(value, fieldIdentifier) {
       // use either id or name of field
       var
@@ -752,41 +791,26 @@ $.fn.form.settings = {
         : false
       ;
     },
+
+    // string length is less than max length
+    maxLength: function(value, maxLength) {
+      return (value !== undefined)
+        ? (value.length <= maxLength)
+        : false
+      ;
+    },
+
+    // value is not exactly notValue
+    not: function(value, notValue) {
+      return (value != notValue);
+    },
+
+    // value is most likely url
     url: function(value) {
       var
         urlRegExp = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/
       ;
       return urlRegExp.test(value);
-    },
-    integer: function(value, range) {
-      var
-        intRegExp = /^\-?\d+$/,
-        min,
-        max,
-        parts
-      ;
-      if (range === undefined || range === '' || range === '..') {
-        // do nothing
-      }
-      else if (range.indexOf('..') == -1) {
-        if (intRegExp.test(range)) {
-          min = max = range - 0;
-        }
-      }
-      else {
-        parts = range.split('..', 2);
-        if (intRegExp.test(parts[0])) {
-          min = parts[0] - 0;
-        }
-        if (intRegExp.test(parts[1])) {
-          max = parts[1] - 0;
-        }
-      }
-      return (
-        intRegExp.test(value) &&
-        (min === undefined || value >= min) &&
-        (max === undefined || value <= max)
-      );
     }
   }
 

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

@@ -41,7 +41,7 @@ $.fn.checkbox = function(parameters) {
         moduleNamespace = 'module-' + namespace,
 
         $module         = $(this),
-        $label          = $(this).next(selector.label).first(),
+        $label          = $(this).find(selector.label).first(),
         $input          = $(this).find(selector.input),
 
         instance        = $module.data(moduleNamespace),
@@ -55,10 +55,10 @@ $.fn.checkbox = function(parameters) {
 
         initialize: function() {
           module.verbose('Initializing checkbox', settings);
-          $module
-            .on('click'   + eventNamespace, module.toggle)
-            .on('keydown' + eventNamespace, selector.input, module.event.keydown)
-          ;
+
+          module.create.label();
+          module.add.events();
+
           if( module.is.checked() ) {
             module.set.checked();
             if(settings.fireOnInit) {
@@ -85,22 +85,16 @@ $.fn.checkbox = function(parameters) {
         },
 
         destroy: function() {
-          module.verbose('Destroying previous module');
+          module.verbose('Destroying module');
+          module.remove.events();
           $module
-            .off(eventNamespace)
             .removeData(moduleNamespace)
           ;
-          $input
-            .off(eventNamespace, module.event.keydown)
-          ;
-          $label
-            .off(eventNamespace)
-          ;
         },
 
         refresh: function() {
           $module = $(this);
-          $label  = $(this).next(selector.label).first();
+          $label  = $(this).find(selector.label).first();
           $input  = $(this).find(selector.input);
         },
 
@@ -120,15 +114,15 @@ $.fn.checkbox = function(parameters) {
 
         attachEvents: function(selector, event) {
           var
-            $toggle = $(selector)
+            $element = $(selector)
           ;
           event = $.isFunction(module[event])
             ? module[event]
             : module.toggle
           ;
-          if($toggle.size() > 0) {
+          if($element.size() > 0) {
             module.debug('Attaching checkbox events to element', selector, event);
-            $toggle
+            $element
               .on('click' + eventNamespace, event)
             ;
           }
@@ -197,9 +191,51 @@ $.fn.checkbox = function(parameters) {
           }
         },
 
+        create: {
+          label: function() {
+            if($input.prevAll(selector.label).size() > 0) {
+              $input.prev(selector.label).detach().insertAfter($input);
+              module.debug('Moving existing label', $label);
+            }
+            else if( !module.has.label() ) {
+              $label = $('<label>').insertAfter($input);
+              module.debug('Creating label', $label);
+            }
+          }
+        },
+
+        has: {
+          label: function() {
+            return ($label.size() > 0);
+          }
+        },
+
+        add: {
+          events: function() {
+            module.verbose('Attaching checkbox events');
+            $module
+              .on('click'   + eventNamespace, module.toggle)
+              .on('keydown' + eventNamespace, selector.input, module.event.keydown)
+            ;
+          }
+        },
+
         remove: {
           checked: function() {
             $module.removeClass(className.checked);
+          },
+          events: function() {
+            module.debug('Removing events');
+            $module
+              .off(eventNamespace)
+              .removeData(moduleNamespace)
+            ;
+            $input
+              .off(eventNamespace, module.event.keydown)
+            ;
+            $label
+              .off(eventNamespace)
+            ;
           }
         },
 

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

@@ -1448,12 +1448,7 @@ $.fn.dropdown.settings.templates = {
       html        = ''
     ;
     $.each(select.values, function(value, name) {
-      if(value === name) {
-        html += '<div class="item">' + name + '</div>';
-      }
-      else {
-        html += '<div class="item" data-value="' + value + '">' + name + '</div>';
-      }
+      html += '<div class="item" data-value="' + value + '">' + name + '</div>';
     });
     return html;
   },
@@ -1472,12 +1467,7 @@ $.fn.dropdown.settings.templates = {
     }
     html += '<div class="menu">';
     $.each(select.values, function(value, name) {
-      if(value === name) {
-        html += '<div class="item">' + name + '</div>';
-      }
-      else {
-        html += '<div class="item" data-value="' + value + '">' + name + '</div>';
-      }
+      html += '<div class="item" data-value="' + value + '">' + name + '</div>';
     });
     html += '</div>';
     return html;

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

@@ -53,9 +53,9 @@ $.fn.modal = function(parameters) {
         eventNamespace  = '.' + namespace,
         moduleNamespace = 'module-' + namespace,
 
-        $module      = $(this),
-        $context     = $(settings.context),
-        $close       = $module.find(selector.close),
+        $module         = $(this),
+        $context        = $(settings.context),
+        $close          = $module.find(selector.close),
 
         $allModals,
         $otherModals,
@@ -63,8 +63,11 @@ $.fn.modal = function(parameters) {
         $dimmable,
         $dimmer,
 
-        element      = this,
-        instance     = $module.data(moduleNamespace),
+        element         = this,
+        instance        = $module.data(moduleNamespace),
+
+        elementNamespace,
+        id,
         observer,
         module
       ;
@@ -78,6 +81,9 @@ $.fn.modal = function(parameters) {
             return;
           }
 
+          id = module.get.uniqueID();
+          elementNamespace = '.' + id;
+
           $dimmable = $context
             .dimmer({
               debug      : settings.debug,
@@ -95,8 +101,7 @@ $.fn.modal = function(parameters) {
           }
 
           $dimmer = $dimmable.dimmer('get dimmer');
-          $otherModals = $module.siblings(selector.modal);
-          $allModals   = $otherModals.add($module);
+          module.refreshModals();
 
           module.verbose('Attaching close events', $close);
           module.bind.events();
@@ -119,6 +124,7 @@ $.fn.modal = function(parameters) {
             .removeData(moduleNamespace)
             .off(eventNamespace)
           ;
+          $window.off(elementNamespace);
           $close.off(eventNamespace);
           $context.dimmer('destroy');
         },
@@ -145,6 +151,11 @@ $.fn.modal = function(parameters) {
           module.set.position();
         },
 
+        refreshModals: function() {
+          $otherModals = $module.siblings(selector.modal);
+          $allModals   = $otherModals.add($module);
+        },
+
         attachEvents: function(selector, event) {
           var
             $toggle = $(selector)
@@ -171,11 +182,17 @@ $.fn.modal = function(parameters) {
               .on('click' + eventNamespace, module.event.close)
             ;
             $window
-              .on('resize' + eventNamespace, module.event.resize)
+              .on('resize' + elementNamespace, module.event.resize)
             ;
           }
         },
 
+        get: {
+          uniqueID: function() {
+            return (Math.random().toString(16) + '000000000').substr(2,8);
+          }
+        },
+
         event: {
           close: function() {
             module.verbose('Closing element pressed');
@@ -200,15 +217,17 @@ $.fn.modal = function(parameters) {
             }
           },
           click: function(event) {
-            if( $(event.target).closest(selector.modal).size() === 0 ) {
+            if( $(event.target).closest($module).size() === 0 ) {
               module.debug('Dimmer clicked, hiding all modals');
-              if(settings.allowMultiple) {
-                module.hide();
-              }
-              else {
-                module.hideAll();
+              if( module.is.active() ) {
+                module.remove.clickaway();
+                if(settings.allowMultiple) {
+                  module.hide();
+                }
+                else {
+                  module.hideAll();
+                }
               }
-              event.stopImmediatePropagation();
             }
           },
           debounce: function(method, delay) {
@@ -252,10 +271,23 @@ $.fn.modal = function(parameters) {
             ? callback
             : function(){}
           ;
+          module.refreshModals();
           module.showDimmer();
           module.showModal(callback);
         },
 
+        hide: function(callback) {
+          callback = $.isFunction(callback)
+            ? callback
+            : function(){}
+          ;
+          module.refreshModals();
+          if( !module.othersActive() ) {
+            module.hideDimmer();
+          }
+          module.hideModal(callback);
+        },
+
         showModal: function(callback) {
           callback = $.isFunction(callback)
             ? callback
@@ -263,7 +295,7 @@ $.fn.modal = function(parameters) {
           ;
           if( !module.is.active() ) {
 
-            if( $otherModals.filter(':visible').size() > 0 && !settings.allowMultiple) {
+            if( !settings.allowMultiple && $otherModals.filter(':visible').size() > 0) {
               module.debug('Other modals visible, queueing show animation');
               module.hideOthers(module.showModal);
             }
@@ -275,15 +307,13 @@ $.fn.modal = function(parameters) {
                 module.set.position();
                 module.set.screenHeight();
                 module.set.type();
+                module.set.clickaway();
                 $module
                   .transition({
                     debug     : settings.debug,
                     animation : settings.transition + ' in',
                     queue     : false,
                     duration  : settings.duration,
-                    onStart   : function() {
-                      module.set.clickaway();
-                    },
                     onComplete : function() {
                       $.proxy(settings.onVisible, element)();
                       module.add.keyboardShortcuts();
@@ -324,29 +354,17 @@ $.fn.modal = function(parameters) {
           }
         },
 
-        hide: function(callback) {
-          callback = $.isFunction(callback)
-            ? callback
-            : function(){}
-          ;
-          if($allModals.filter(':visible').size() <= 1) {
-            module.hideDimmer();
-          }
-          module.hideModal(callback);
-        },
-
         hideDimmer: function() {
           if( !($dimmable.dimmer('is active') || $dimmable.dimmer('is animating')) ) {
             module.debug('Dimmer is not visible cannot hide');
             return;
           }
           module.debug('Hiding dimmer');
-          module.remove.clickaway();
           $dimmable.dimmer('hide', function() {
             if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
+              module.remove.clickaway();
               module.remove.screenHeight();
             }
-            module.remove.active();
           });
         },
 
@@ -358,6 +376,7 @@ $.fn.modal = function(parameters) {
           module.debug('Hiding modal');
           $.proxy(settings.onHide, element)();
           if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) {
+            module.remove.active();
             $module
               .transition({
                 debug      : settings.debug,
@@ -369,7 +388,6 @@ $.fn.modal = function(parameters) {
                 },
                 onComplete : function() {
                   $.proxy(settings.onHidden, element)();
-                  module.remove.active();
                   module.restore.focus();
                   callback();
                 }
@@ -377,11 +395,11 @@ $.fn.modal = function(parameters) {
             ;
           }
           else {
+            module.remove.active();
             module.remove.keyboardShortcuts();
             $module
               .fadeOut(settings.duration, settings.easing, function() {
                 $.proxy(settings.onHidden, element)();
-                module.remove.active();
                 module.restore.focus();
                 callback();
               })
@@ -418,6 +436,10 @@ $.fn.modal = function(parameters) {
           }
         },
 
+        othersActive: function() {
+          return ($otherModals.filter('.' + className.active).size() > 0);
+        },
+
         add: {
           keyboardShortcuts: function() {
             module.verbose('Adding keyboard shortcuts');
@@ -448,7 +470,7 @@ $.fn.modal = function(parameters) {
           clickaway: function() {
             if(settings.closable) {
               $dimmer
-                .off('click' + eventNamespace)
+                .off('click' + elementNamespace)
               ;
             }
           },
@@ -504,6 +526,9 @@ $.fn.modal = function(parameters) {
               : $module.is(':visible')
             ;
           },
+          scrolling: function() {
+            return $dimmable.hasClass(className.scrolling);
+          },
           modernBrowser: function() {
             // appName for IE11 reports 'Netscape' can no longer use
             return !(window.ActiveXObject || "ActiveXObject" in window);
@@ -526,8 +551,7 @@ $.fn.modal = function(parameters) {
           clickaway: function() {
             if(settings.closable) {
               $dimmer
-                .off('click' + eventNamespace)
-                .on('click' + eventNamespace, module.event.click)
+                .on('click' + elementNamespace, module.event.click)
               ;
             }
           },
@@ -552,7 +576,9 @@ $.fn.modal = function(parameters) {
           type: function() {
             if(module.can.fit()) {
               module.verbose('Modal fits on screen');
-              module.remove.scrolling();
+              if(!module.othersActive) {
+                module.remove.scrolling();
+              }
             }
             else {
               module.verbose('Modal cannot fit on screen setting to scrolling');

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

@@ -73,10 +73,9 @@ $.fn.progress = function(parameters) {
         },
 
         destroy: function() {
-          module.verbose('Destroying previous dropdown for', $module);
-          $module
-            .removeData(moduleNamespace)
-          ;
+          module.verbose('Destroying previous progress for', $module);
+          module.remove.state();
+          $module.removeData(moduleNamespace);
           instance = undefined;
         },
 
@@ -216,6 +215,12 @@ $.fn.progress = function(parameters) {
         },
 
         remove: {
+          state: function() {
+            module.verbose('Removing stored state');
+            delete module.total;
+            delete module.percent;
+            delete module.value;
+          },
           active: function() {
             module.verbose('Removing active state');
             $module.removeClass(className.active);
@@ -239,27 +244,34 @@ $.fn.progress = function(parameters) {
             if(value > 100) {
               module.error(error.tooHigh, value);
             }
-            $bar
-              .css('width', value + '%')
-            ;
+            else if (value < 0) {
+              module.error(error.tooLow, value);
+            }
+            else {
+              $bar
+                .css('width', value + '%')
+              ;
+            }
           },
           initials: function() {
-            if(settings.value) {
-              module.verbose('Current value set in settings', settings.value);
-              module.value = settings.value;
-            }
-            if(settings.total) {
+
+            if(settings.total !== false) {
               module.verbose('Current total set in settings', settings.total);
               module.total = settings.total;
             }
-            if(settings.percent) {
+            if(settings.value !== false) {
+              module.verbose('Current value set in settings', settings.value);
+              module.value = settings.value;
+            }
+            if(settings.percent !== false) {
               module.verbose('Current percent set in settings', settings.percent);
               module.percent = settings.percent;
             }
-            if(module.percent) {
+
+            if(module.percent !== undefined) {
               module.set.percent(module.percent);
             }
-            else if(module.value) {
+            else if(module.value !== undefined) {
               module.set.progress(module.value);
             }
           },
@@ -283,6 +295,14 @@ $.fn.progress = function(parameters) {
             if(module.total) {
               module.value = Math.round( (percent / 100) * module.total);
             }
+            if(settings.limitValues) {
+              module.value = (module.value > 100)
+                ? 100
+                : (module.value < 0)
+                  ? 0
+                  : module.value
+              ;
+            }
             module.set.barWidth(percent);
             module.set.barLabel();
             if(percent === 100) {
@@ -294,7 +314,7 @@ $.fn.progress = function(parameters) {
                 module.remove.active();
               }
             }
-            else {
+            else if(percent > 0) {
               module.set.active();
             }
             $.proxy(settings.onChange, element)(percent, module.value, module.total);
@@ -385,8 +405,8 @@ $.fn.progress = function(parameters) {
                 : value,
               percentComplete
             ;
-            if(!numericValue) {
-              module.error(error.nonNumeric);
+            if(numericValue === false) {
+              module.error(error.nonNumeric, value);
             }
             if(module.total) {
               module.value    = numericValue;
@@ -584,7 +604,7 @@ $.fn.progress.settings = {
   name         : 'Progress',
   namespace    : 'progress',
 
-  debug        : true,
+  debug        : false,
   verbose      : true,
   performance  : true,
 
@@ -595,6 +615,7 @@ $.fn.progress.settings = {
 
   autoSuccess  : true,
   showActivity : true,
+  limitValues  : true,
 
   label        : 'percent',
   precision    : 1,
@@ -611,7 +632,9 @@ $.fn.progress.settings = {
 
   error    : {
     method     : 'The method you called is not defined.',
-    nonNumeric : 'Progress value is non numeric'
+    nonNumeric : 'Progress value is non numeric',
+    tooHigh    : 'Value specified is above 100%',
+    tooLow     : 'Value specified is below 0%'
   },
 
   regExp: {

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

@@ -16,6 +16,8 @@
 $.fn.sidebar = function(parameters) {
   var
     $allModules    = $(this),
+    $window        = $(window),
+    $document      = $(document),
     $head          = $('head'),
 
     moduleSelector = $allModules.selector || '',
@@ -61,6 +63,8 @@ $.fn.sidebar = function(parameters) {
         element         = this,
         instance        = $module.data(moduleNamespace),
 
+        elementNamespace,
+        id,
         currentScroll,
         transitionEvent,
 
@@ -80,7 +84,10 @@ $.fn.sidebar = function(parameters) {
             settings.useLegacy = true;
           }
 
-          // avoid locking rendering if included in onReady
+          id = module.get.uniqueID();
+          elementNamespace = '.' + id;
+
+          // avoids locking rendering if initialized in onReady
           requestAnimationFrame(module.setup.layout);
 
           module.instantiate();
@@ -101,6 +108,10 @@ $.fn.sidebar = function(parameters) {
             .off(eventNamespace)
             .removeData(moduleNamespace)
           ;
+          // bound by uuid
+          $context.off(elementNamespace);
+          $window.off(elementNamespace);
+          $document.off(elementNamespace);
         },
 
         event: {
@@ -130,31 +141,40 @@ $.fn.sidebar = function(parameters) {
 
         bind: {
           clickaway: function() {
+            module.verbose('Adding clickaway events to context', $context);
+            if(settings.closable) {
+              $context
+                .on('click' + elementNamespace, module.event.clickaway)
+                .on('touchend' + elementNamespace, module.event.clickaway)
+              ;
+            }
+          },
+          scrollLock: function() {
             if(settings.scrollLock) {
-              $(window)
-                .on('DOMMouseScroll' + eventNamespace, module.event.scroll)
+              module.debug('Disabling page scroll');
+              $window
+                .on('DOMMouseScroll' + elementNamespace, module.event.scroll)
               ;
             }
-            $(document)
-              .on('touchmove' + eventNamespace, module.event.touch)
+            module.verbose('Adding events to contain sidebar scroll');
+            $document
+              .on('touchmove' + elementNamespace, module.event.touch)
             ;
             $module
               .on('scroll' + eventNamespace, module.event.containScroll)
             ;
-            if(settings.closable) {
-              $context
-                .on('click' + eventNamespace, module.event.clickaway)
-                .on('touchend' + eventNamespace, module.event.clickaway)
-              ;
-            }
           }
         },
         unbind: {
           clickaway: function() {
-            $context.off(eventNamespace);
-            $pusher.off(eventNamespace);
-            $(document).off(eventNamespace);
-            $(window).off(eventNamespace);
+            module.verbose('Removing clickaway events from context', $context);
+            $context.off(elementNamespace);
+          },
+          scrollLock: function() {
+            module.verbose('Removing scroll lock from page');
+            $document.off(elementNamespace);
+            $window.off(elementNamespace);
+            $module.off('scroll' + eventNamespace);
           }
         },
 
@@ -239,6 +259,11 @@ $.fn.sidebar = function(parameters) {
           $pusher   = $context.children(selector.pusher);
         },
 
+        refreshSidebars: function() {
+          module.verbose('Refreshing other sidebars');
+          $sidebars = $context.children(selector.sidebar);
+        },
+
         repaint: function() {
           module.verbose('Forcing repaint event');
           element.style.display='none';
@@ -261,7 +286,7 @@ $.fn.sidebar = function(parameters) {
               ;
               module.refresh();
             }
-            if($module.nextAll(selector.pusher).size() == 0 || $module.nextAll(selector.pusher)[0] !== $pusher[0]) {
+            if($module.nextAll(selector.pusher).size() === 0 || $module.nextAll(selector.pusher)[0] !== $pusher[0]) {
               module.debug('Moved sidebar to correct parent element');
               module.error(error.movedSidebar, element);
               $module.detach().prependTo($context);
@@ -301,7 +326,8 @@ $.fn.sidebar = function(parameters) {
             ? callback
             : function(){}
           ;
-          if(module.is.closed()) {
+          if(module.is.hidden()) {
+            module.refreshSidebars();
             if(settings.overlay)  {
               module.error(error.overlay);
               settings.transition = 'overlay';
@@ -337,6 +363,7 @@ $.fn.sidebar = function(parameters) {
           ;
           if(module.is.visible() || module.is.animating()) {
             module.debug('Hiding sidebar', callback);
+            module.refreshSidebars();
             animateMethod(function() {
               $.proxy(callback, element)();
               $.proxy(settings.onHidden, element)();
@@ -349,9 +376,6 @@ $.fn.sidebar = function(parameters) {
         othersVisible: function() {
           return ($sidebars.not($module).filter('.' + className.visible).size() > 0);
         },
-        othersActive: function() {
-          return ($sidebars.not($module).filter('.' + className.active).size() > 0);
-        },
 
         hideOthers: function(callback) {
           var
@@ -372,7 +396,7 @@ $.fn.sidebar = function(parameters) {
 
         toggle: function() {
           module.verbose('Determining toggled direction');
-          if(module.is.closed()) {
+          if(module.is.hidden()) {
             module.show();
           }
           else {
@@ -401,10 +425,11 @@ $.fn.sidebar = function(parameters) {
           module.set.transition();
           module.repaint();
           animate = function() {
+            module.bind.clickaway();
             module.add.bodyCSS();
             module.set.animating();
             module.set.visible();
-            if(!module.othersActive()) {
+            if(!module.othersVisible()) {
               if(settings.dimPage) {
                 $pusher.addClass(className.dimmed);
               }
@@ -412,13 +437,14 @@ $.fn.sidebar = function(parameters) {
           };
           transitionEnd = function(event) {
             if( event.target == $transition[0] ) {
-              $transition.off(transitionEvent + eventNamespace, transitionEnd);
+              $transition.off(transitionEvent + elementNamespace, transitionEnd);
               module.remove.animating();
-              module.bind.clickaway();
+              module.bind.scrollLock();
               $.proxy(callback, element)();
             }
           };
-          $transition.on(transitionEvent + eventNamespace, transitionEnd);
+          $transition.off(transitionEvent + elementNamespace);
+          $transition.on(transitionEvent + elementNamespace, transitionEnd);
           requestAnimationFrame(animate);
         },
 
@@ -427,7 +453,7 @@ $.fn.sidebar = function(parameters) {
             transition = module.get.transition(),
             $transition = (transition == 'safe')
               ? $context
-              : (transition == 'overlay' || module.othersActive())
+              : (transition == 'overlay' || module.othersVisible())
                 ? $module
                 : $pusher,
             animate,
@@ -438,19 +464,20 @@ $.fn.sidebar = function(parameters) {
             : function(){}
           ;
           module.verbose('Removing context push state', module.get.direction());
-          if(!module.othersActive()) {
-            module.unbind.clickaway();
-          }
+
+          module.unbind.clickaway();
+          module.unbind.scrollLock();
+
           animate = function() {
             module.set.animating();
             module.remove.visible();
-            if(settings.dimPage && !module.othersActive()) {
+            if(settings.dimPage && !module.othersVisible()) {
               $pusher.removeClass(className.dimmed);
             }
           };
           transitionEnd = function(event) {
             if( event.target == $transition[0] ) {
-              $transition.off(transitionEvent + eventNamespace, transitionEnd);
+              $transition.off(transitionEvent + elementNamespace, transitionEnd);
               module.remove.animating();
               module.remove.transition();
               module.remove.bodyCSS();
@@ -460,7 +487,8 @@ $.fn.sidebar = function(parameters) {
               $.proxy(callback, element)();
             }
           };
-          $transition.on(transitionEvent + eventNamespace, transitionEnd);
+          $transition.off(transitionEvent + elementNamespace);
+          $transition.on(transitionEvent + elementNamespace, transitionEnd);
           requestAnimationFrame(animate);
         },
 
@@ -646,6 +674,9 @@ $.fn.sidebar = function(parameters) {
                 return transitions[transition];
               }
             }
+          },
+          uniqueID: function() {
+            return (Math.random().toString(16) + '000000000').substr(2,8);
           }
         },
 
@@ -698,12 +729,19 @@ $.fn.sidebar = function(parameters) {
               return false;
             }
           },
-          closed: function() {
+          hidden: function() {
             return !module.is.visible();
           },
           visible: function() {
             return $module.hasClass(className.visible);
           },
+          // alias
+          open: function() {
+            return module.is.visible();
+          },
+          closed: function() {
+            return module.is.hidden();
+          },
           vertical: function() {
             return $module.hasClass(className.top);
           },

data/assets/stylesheets/semantic_ui/definitions/collections/form.less

@@ -98,6 +98,7 @@
 .ui.form input[type="text"],
 .ui.form input[type="email"],
 .ui.form input[type="date"],
+.ui.form input[type="datetime-local"],
 .ui.form input[type="password"],
 .ui.form input[type="number"],
 .ui.form input[type="url"],
@@ -110,6 +111,7 @@
 .ui.form input[type="text"],
 .ui.form input[type="email"],
 .ui.form input[type="date"],
+.ui.form input[type="datetime-local"],
 .ui.form input[type="password"],
 .ui.form input[type="number"],
 .ui.form input[type="url"],
@@ -294,6 +296,7 @@
 .ui.form input[type="text"]:focus,
 .ui.form input[type="email"]:focus,
 .ui.form input[type="date"]:focus,
+.ui.form input[type="datetime-local"]:focus,
 .ui.form input[type="password"]:focus,
 .ui.form input[type="number"]:focus,
 .ui.form input[type="url"]:focus,
@@ -358,6 +361,7 @@
 .ui.form .fields.error .field input[type="text"],
 .ui.form .fields.error .field input[type="email"],
 .ui.form .fields.error .field input[type="date"],
+.ui.form .fields.error .field input[type="datetime-local"],
 .ui.form .fields.error .field input[type="password"],
 .ui.form .fields.error .field input[type="number"],
 .ui.form .fields.error .field input[type="url"],
@@ -366,6 +370,7 @@
 .ui.form .field.error input[type="text"],
 .ui.form .field.error input[type="email"],
 .ui.form .field.error input[type="date"],
+.ui.form .field.error input[type="datetime-local"],
 .ui.form .field.error input[type="password"],
 .ui.form .field.error input[type="number"],
 .ui.form .field.error input[type="url"],
@@ -380,6 +385,7 @@
 .ui.form .field.error input[type="text"]:focus,
 .ui.form .field.error input[type="email"]:focus,
 .ui.form .field.error input[type="date"]:focus,
+.ui.form .field.error input[type="datetime-local"]:focus,
 .ui.form .field.error input[type="password"]:focus,
 .ui.form .field.error input[type="number"]:focus,
 .ui.form .field.error input[type="url"]:focus,
@@ -533,15 +539,27 @@
 ---------------------*/
 
 .ui.form .required.fields > .field > label:after,
-.ui.form .required.fields > .field > .checkbox:after,
 .ui.form .required.field > label:after,
+.ui.form .required.fields > .field > .checkbox:after,
 .ui.form .required.field > .checkbox:after {
-  margin: -0.2em 0em 0em 0.2em;
-  vertical-align: top;
-  content: '*';
+  margin: @requiredMargin;
+  content: @requiredContent;
   color: @requiredColor;
 }
 
+.ui.form .required.fields > .field > label:after,
+.ui.form .required.field > label:after {
+  display: inline-block;
+  vertical-align: top;
+}
+
+.ui.form .required.fields > .field > .checkbox:after,
+.ui.form .required.field > .checkbox:after {
+  position: absolute;
+  top: 0%;
+  left: 100%;
+}
+
 
 /*******************************
            Variations

data/assets/stylesheets/semantic_ui/definitions/collections/grid.less

@@ -1586,52 +1586,45 @@
   .ui.stackable.grid {
     display: block !important;
     width: auto;
+    margin-left: -(@stackableGutter / 2);
+    margin-right: -(@stackableGutter / 2);
     padding: 0em;
-    margin-top: 0em;
-    margin-bottom: 0em;
-  }
-  :not(.column) > .ui.stackable.grid {
-    margin: 0em;
   }
   .ui.stackable.grid > .row > .wide.column,
   .ui.stackable.grid > .wide.column,
   .ui.stackable.grid > .column.grid > .column,
   .ui.stackable.grid > .column.row > .column,
   .ui.stackable.grid > .row > .column,
-  .ui.stackable.grid > .column {
+  .ui.stackable.grid > .column:not(.row) {
     display: block !important;
     width: auto !important;
 
-    margin: (@stackableRowSpacing / 4) 0em !important;
-    padding: (@stackableRowSpacing / 4) (@stackableGutter / 2) 0em !important;
-
+    margin: 0em 0em !important;
+    padding: (@stackableRowSpacing / 2) (@stackableGutter) !important;
     box-shadow: none !important;
   }
+  .ui.stackable.grid > .row {
+    margin: 0em;
+    padding: 0em;
+  }
 
-  .ui.stackable.celled.grid > .column,
+  .ui.stackable.celled.grid > .column:not(.row),
+  .ui.stackable.divided.grid > .column:not(.row),
   .ui.stackable.celled.grid > .row > .column,
-  .ui.stackable.divided.grid > .column,
   .ui.stackable.divided.grid > .row > .column {
     border-top: @stackableMobileBorder;
     box-shadow: none !important;
-    margin: (@stackableRowSpacing) 0em !important;
-    padding: (@stackableRowSpacing) (@stackableGutter / 2) 0em !important;
   }
-  .ui.inverted.stackable.celled.grid > .column,
+  .ui.inverted.stackable.celled.grid > .column:not(.row),
+  .ui.inverted.stackable.divided.grid > .column:not(.row),
   .ui.inverted.stackable.celled.grid > .row > .column,
-  .ui.inverted.stackable.divided.grid > .column,
   .ui.inverted.stackable.divided.grid > .row > .column {
     border-top: @stackableInvertedMobileBorder;
   }
-  .ui.stackable.grid > .row:first-child > .column:first-child,
-  .ui.stackable.grid > .column:first-child {
-    margin-top: 0em !important;
-    padding-top: 0em !important;
-  }
   .ui.stackable.divided.grid > .row:first-child > .column:first-child,
   .ui.stackable.celled.grid > .row:first-child > .column:first-child,
-  .ui.stackable.divided.grid > .column:first-child,
-  .ui.stackable.celled.grid > .column:first-child {
+  .ui.stackable.divided.grid > .column:not(.row):first-child,
+  .ui.stackable.celled.grid > .column:not(.row):first-child {
     border-top: none !important;
   }
 

data/assets/stylesheets/semantic_ui/definitions/views/card.less

@@ -293,12 +293,12 @@
 }
 
 /* Meta */
-.ui.cards > .card .meta a,
-.ui.card .meta a {
+.ui.cards > .card .meta > a:not(.ui),
+.ui.card .meta > a:not(.ui) {
   color: @metaLinkColor;
 }
-.ui.cards > .card .meta a:hover,
-.ui.card .meta a:hover {
+.ui.cards > .card .meta > a:not(.ui):hover,
+.ui.card .meta > a:not(.ui):hover {
   color: @metaLinkHoverColor;
 }
 

data/assets/stylesheets/semantic_ui/definitions/views/item.less

@@ -255,10 +255,10 @@
 }
 
 /* Meta */
-.ui.items > .item .meta a {
+.ui.items > .item .meta > a:not(.ui) {
   color: @metaLinkColor;
 }
-.ui.items > .item .meta a:hover {
+.ui.items > .item .meta > a:not(.ui):hover {
   color: @metaLinkHoverColor;
 }
 

data/assets/stylesheets/semantic_ui/themes/default/collections/form.variables

@@ -141,8 +141,11 @@
 --------------------*/
 
 /* Required */
+@requiredContent: '*';
 @requiredColor: @negativeColor;
 @requiredVerticalOffset: -0.2em;
+@requiredDistance: 0.2em;
+@requiredMargin: @requiredVerticalOffset 0em 0em @requiredDistance;
 
 /* Inverted */
 @invertedLabelColor: @invertedTextColor;

data/assets/stylesheets/semantic_ui/themes/default/collections/grid.variables

@@ -20,7 +20,6 @@
 @rowSpacing: 2rem;
 
 @tableWidth: ~"calc(100% + "@gutterWidth~")";
-
 @columnMaxImageWidth: 100%;
 
 /*******************************

data/assets/stylesheets/semantic_ui/themes/default/globals/site.variables

@@ -13,9 +13,10 @@
 @importGoogleFonts : true;
 @googleFontName    : 'Lato';
 @googleFontSizes   : '400,700,400italic,700italic';
+@googleSubset      : 'latin';
 
 @googleProtocol    : 'http://';
-@googleFontRequest : '@{googleFontName}:@{googleFontSizes}';
+@googleFontRequest : '@{googleFontName}:@{googleFontSizes}&subset=@{googleSubset}';
 
 /*-------------------
       Base Sizes

data/assets/stylesheets/semantic_ui/themes/default/modules/modal.variables

@@ -7,7 +7,7 @@
 @width: 90%;
 @xOffset: -(@width / 2);
 @borderRadius: @defaultBorderRadius;
-@boxShadow: 0px 0px 8px rgba(0, 0, 0, 0.8);
+@boxShadow: 0 1px 4px 1px rgba(0, 0, 0, 0.3);
 
 /* Close Icon */
 @closeOpacity: 0.8;

data/assets/stylesheets/semantic_ui/themes/default/views/card.variables

@@ -80,11 +80,13 @@
 @likeActiveColor: #EF404A;
 
 /* Links */
-@contentLinkColor: @linkColor;
+@contentLinkColor: '';
+@contentLinkHoverColor: '';
 @contentLinkTransition: color @transitionDuration @transitionEasing;
-@contentLinkHoverColor: @linkHoverColor;
+
 @headerLinkColor: @headerColor;
 @headerLinkHoverColor: @linkHoverColor;
+
 @metaLinkColor: @lightTextColor;
 @metaLinkHoverColor: @textColor;
 

data/assets/stylesheets/semantic_ui/themes/default/views/item.variables

@@ -88,13 +88,14 @@
 @likeActiveColor: #FF2733;
 
 /* Links */
-@contentLinkTransition: color @transitionDuration @transitionEasing;
-@contentLinkColor: @linkColor;
-@contentLinkHoverColor: @linkHoverColor;
 @headerLinkColor: @headerColor;
 @headerLinkHoverColor: @linkHoverColor;
 @metaLinkColor: @lightTextColor;
 @metaLinkHoverColor: @textColor;
+@contentLinkColor: '';
+@contentLinkHoverColor: '';
+@contentLinkTransition: color @transitionDuration @transitionEasing;
+
 
 /* Description */
 @descriptionDistance: 0.6em;

data/assets/stylesheets/semantic_ui/themes/fixed-width/collections/grid.variables

@@ -20,6 +20,4 @@
 @widescreenMargin: auto;
 @widescreenMonitorGutter: 0;
 
-@tableWidth: '';
-@relaxedTableWidth: '';
-@veryRelaxedTableWidth: '';
+@tableWidth: '';

data/less-rails-semantic_ui.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'less-rails-semantic_ui'
-  spec.version       = '1.1.2.0'
+  spec.version       = '1.2.0.0'
   spec.authors       = ['Maxim Dobryakov']
   spec.email         = ['maxim.dobryakov@gmail.com']
   spec.summary       = %q{Semantic UI assets for Rails}

data/tasks/update.rake

@@ -99,7 +99,7 @@ namespace :update do
     patch(theme_config_file) do |content|
       content = must_be_changed(content) { |c| c.sub(%r{\/\*.*?\*\/}m, '') }
       content = must_be_changed(content) { |c| c.gsub(%q{@themesFolder : 'themes/';}, %q{@themesFolder : 'semantic_ui/themes/';}) }
-      content = must_be_changed(content) { |c| c.gsub(%q{@siteFolder  : '_site/';}, %q{@siteFolder  : 'semantic_ui/config/';}) }
+      content = must_be_changed(content) { |c| c.gsub(%q{@siteFolder  : 'site/';}, %q{@siteFolder  : 'semantic_ui/config/';}) }
       must_be_changed(content) { |c| c.gsub(%q{@import "theme.less";}, %q{@import "semantic_ui/theme.less";}) }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: less-rails-semantic_ui
 version: !ruby/object:Gem::Version
-  version: 1.1.2.0
+  version: 1.2.0.0
 platform: ruby
 authors:
 - Maxim Dobryakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: less-rails