mui-sass 0.7.5 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e6e89d89e35090e22194c3461fb9a8662b5ca71
-  data.tar.gz: ac43c85993e893f9082366b8580b05083553045f
+  metadata.gz: 812fecbc763791d5dd154a8d92e723f02664c562
+  data.tar.gz: 8d7bc80f1f71e491fc86cfc80564d93663402eec
 SHA512:
-  metadata.gz: 8ff264429310f6ba2d86bb93ae01afb5f9d1babefbd4cb1658546ebdc280a4d5ef85fb58fc9533069017b6d68e7f8e636508ed6887d364613cf76d983140b776
-  data.tar.gz: 1ab69866de2f61249df45bfde26d2bbf74bcece9878bf8f6ec4b8beb43a6d6a55686ef4337c18a8c4e654ce2beeafcd6e46c57ee3ba6067a6f45dec85b143c23
+  metadata.gz: d9e1fea5fbd2f770c09278891da775a9503c82a54fbceba9842e21e6c719429f459ab747cafbbef04ad79b20328f9a0bbb48a84e644b1ef5e9cd2d293d67085f
+  data.tar.gz: 03409819887debb1c88e63538189be9aacff1c385d10b5764c7a45f338cb7af78b8c350ca5ae67b4b83f4f58ed5753c5b0df969c006e3a73e7ce45b79fb3d191

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.1 (2016-09-21)
+
+- Update assets to match upstream version
+
 ## 0.7.5 (2016-09-16)
 
 - Update assets to match upstream version

data/lib/mui/sass/version.rb

@@ -1,5 +1,5 @@
 module Mui
   module Sass
-    VERSION = '0.7.5'
+    VERSION = '0.8.1'
   end
 end

data/vendor/assets/javascripts/mui.js

@@ -1267,6 +1267,7 @@ var jqLite = require('./lib/jqLite'),
     cssSelector = '.mui-select > select',
     menuClass = 'mui-select__menu',
     selectedClass = 'mui--is-selected',
+    disabledClass = 'mui--is-disabled',
     doc = document,
     win = window;
 
@@ -1404,9 +1405,9 @@ function Menu(wrapperEl, selectEl) {
   util.enableScrollLock();
 
   // instance variables
-  this.indexMap = {};
-  this.origIndex = null;
-  this.currentIndex = null;
+  this.itemArray = [];
+  this.origPos = null;
+  this.currentPos = null;
   this.selectEl = selectEl;
   this.menuEl = this._createMenuEl(wrapperEl, selectEl);
   this.clickCallbackFn = util.callback(this, 'clickHandler');
@@ -1443,8 +1444,9 @@ function Menu(wrapperEl, selectEl) {
 Menu.prototype._createMenuEl = function(wrapperEl, selectEl) {
   var menuEl = doc.createElement('div'),
       childEls = selectEl.children,
-      indexNum = 0,
-      indexMap = this.indexMap,
+      itemArray = this.itemArray,
+      itemPos = 0,
+      selectedPos = 0,
       selectedRow = 0,
       loopEl,
       rowEl,
@@ -1481,30 +1483,37 @@ Menu.prototype._createMenuEl = function(wrapperEl, selectEl) {
       // add row item to menu
       rowEl = doc.createElement('div');
       rowEl.textContent = loopEl.textContent;
-      rowEl._muiIndex = indexNum;
-
-      // handle selected options
-      if (loopEl.selected) {
-        rowEl.className = selectedClass;
-        selectedRow = menuEl.children.length;
-      }
 
       // handle optgroup options
       if (inGroup) jqLite.addClass(rowEl, 'mui-optgroup__option');
 
-      menuEl.appendChild(rowEl);
+      if (loopEl.disabled) {
+        // do not attach muiIndex to disable <option> elements to make them
+        // unselectable.
+        jqLite.addClass(rowEl, disabledClass);
+      } else {
+        rowEl._muiIndex = loopEl.index;
+        rowEl._muiPos = itemPos;
+
+        // handle selected options
+        if (loopEl.selected) {
+          jqLite.addClass(rowEl, selectedClass);
+          selectedRow = menuEl.children.length;
+          selectedPos = itemPos;
+        }
 
-      // add to index map
-      indexMap[indexNum] = rowEl;
-      indexNum += 1;
+        // add to item array
+        itemArray.push(rowEl);
+        itemPos += 1;
+      }
+
+      menuEl.appendChild(rowEl);
     }
   }
 
   // save indices
-  var selectedIndex = selectEl.selectedIndex;
-
-  this.origIndex = selectedIndex;
-  this.currentIndex = selectedIndex;
+  this.origPos = selectedPos;
+  this.currentPos = selectedPos;
 
   // set position
   var props = formlib.getMenuPositionalCSS(
@@ -1556,13 +1565,14 @@ Menu.prototype.clickHandler = function(ev) {
   // don't allow events to bubble
   ev.stopPropagation();
 
-  var index = ev.target._muiIndex;
+  var item = ev.target,
+      index = item._muiIndex;
 
   // ignore clicks on non-items                                               
   if (index === undefined) return;
 
   // select option
-  this.currentIndex = index;
+  this.currentPos = item._muiPos;
   this.selectCurrent();
 
   // destroy menu
@@ -1574,14 +1584,14 @@ Menu.prototype.clickHandler = function(ev) {
  * Increment selected item
  */
 Menu.prototype.increment = function() {
-  if (this.currentIndex === this.selectEl.length - 1) return;
+  if (this.currentPos === this.itemArray.length - 1) return;
 
   // un-select old row
-  jqLite.removeClass(this.indexMap[this.currentIndex], selectedClass);
+  jqLite.removeClass(this.itemArray[this.currentPos], selectedClass);
 
   // select new row
-  this.currentIndex += 1;
-  jqLite.addClass(this.indexMap[this.currentIndex], selectedClass);
+  this.currentPos += 1;
+  jqLite.addClass(this.itemArray[this.currentPos], selectedClass);
 }
 
 
@@ -1589,14 +1599,14 @@ Menu.prototype.increment = function() {
  * Decrement selected item
  */
 Menu.prototype.decrement = function() {
-  if (this.currentIndex === 0) return;
+  if (this.currentPos === 0) return;
 
   // un-select old row
-  jqLite.removeClass(this.indexMap[this.currentIndex], selectedClass);
+  jqLite.removeClass(this.itemArray[this.currentPos], selectedClass);
 
   // select new row
-  this.currentIndex -= 1;
-  jqLite.addClass(this.indexMap[this.currentIndex], selectedClass);
+  this.currentPos -= 1;
+  jqLite.addClass(this.itemArray[this.currentPos], selectedClass);
 }
 
 
@@ -1604,8 +1614,8 @@ Menu.prototype.decrement = function() {
  * Select current item
  */
 Menu.prototype.selectCurrent = function() {
-  if (this.currentIndex !== this.origIndex) {
-    this.selectEl.selectedIndex = this.currentIndex;
+  if (this.currentPos !== this.origPos) {
+    this.selectEl.selectedIndex = this.itemArray[this.currentPos]._muiIndex;
 
     // trigger change event
     util.dispatchEvent(this.selectEl, 'change');

data/vendor/assets/stylesheets/mui/_select.scss

@@ -113,7 +113,12 @@ $xFormLabelLineHeight: floor($mui-label-font-size * 1.25);
       background-color: mui-color('grey', '200');
     }
 
-    &:not(.mui-optgroup__label):hover {
+    &.mui--is-disabled {
+      color: $mui-text-dark-hint;
+      cursor: $mui-cursor-disabled;
+    }
+
+    &:not(.mui-optgroup__label):not(.mui--is-disabled):hover {
       background-color: mui-color('grey', '300');
     }
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mui-sass
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.1
 platform: ruby
 authors:
 - Dmitriy Tarasov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass