mui-sass 0.9.27 → 0.9.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f244354edb4cba236419e6239a0f5eabdcd6d32c
-  data.tar.gz: d3ec7859772af0c3fddb201fc8c2ee291b614414
+  metadata.gz: b9838ec4cc616cc23a464cb3a27334a4f26f9b2c
+  data.tar.gz: b15383f90e0811811d3f573e31bdc486b47e8d4c
 SHA512:
-  metadata.gz: 5420e3279942565128744b4fb61a0c7eff3c4107dd887c1c4adce48513bb71b77897cbe72f3d2b7e22432acca649e0d4d5d46ed63148d81cc31f3a5ad1e15c11
-  data.tar.gz: 6ed10ce06107e40b47f9f1b2b6712e3d4a1437f31c5eb988822206af3fdd12ceef37417af7b60ee3926f3f484c20ee813e490b37214a1f92550aed93016d31fc
+  metadata.gz: 665edc4f1af2fd42abdfc3c3c55571ba31c5858238383ca24a59a3be268b20f0de29e8f3432bb24ffec330053f2b2a2dfe2480b0084f182e14be0ecf98411552
+  data.tar.gz: 7946b403b214369b7a7e2eb28a4f030f8af6694ea238b403aaa370eb3fd3d6f73163f4b0e99cab7e72669fba4f609efeda082bd1ae4bbc87c4b440d4d5db2a04

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.28 (2017-10-31)
+
+- Update assets to match upstream version
+
 ## 0.9.27 (2017-10-31)
 
 - Update assets to match upstream version

data/lib/mui/sass/version.rb

@@ -1,5 +1,5 @@
 module Mui
   module Sass
-    VERSION = '0.9.27'.freeze
+    VERSION = '0.9.28'.freeze
   end
 end

data/vendor/assets/javascripts/mui.js

@@ -161,29 +161,29 @@ module.exports = {
 
 'use strict';
 
-var wrapperPadding = 15,  // from CSS
-    inputHeight = 32,  // from CSS
-    rowHeight = 42,  // from CSS
-    menuPadding = 8;  // from CSS
+var jqLite = require('./jqLite');
 
 
 /**
  * Menu position/size/scroll helper
  * @returns {Object} Object with keys 'height', 'top', 'scrollTop'
  */
-function getMenuPositionalCSSFn(wrapperEl, numRows, selectedRow) {
-  var viewHeight = document.documentElement.clientHeight;
+function getMenuPositionalCSSFn(wrapperEl, menuEl, selectedRow) {
+  var viewHeight = document.documentElement.clientHeight,
+      numRows = menuEl.children.length;
 
-  // determine 'height'
-  var h = numRows * rowHeight + 2 * menuPadding,
+  // determine menu height
+  var h = parseInt(menuEl.offsetHeight),
       height = Math.min(h, viewHeight);
 
+  // determine row height
+  var p = parseInt(jqLite.css(menuEl, 'padding-top')),
+      rowHeight = (h - 2 * p) / numRows;
+
   // determine 'top'
   var top, initTop, minTop, maxTop;
 
-  initTop = (menuPadding + rowHeight) - (wrapperPadding + inputHeight);
-  initTop -= selectedRow * rowHeight;
-
+  initTop = -1 * selectedRow * rowHeight;
   minTop = -1 * wrapperEl.getBoundingClientRect().top;
   maxTop = (viewHeight - height) + minTop;
 
@@ -195,9 +195,8 @@ function getMenuPositionalCSSFn(wrapperEl, numRows, selectedRow) {
       scrollMax;
 
   if (h > viewHeight) {
-    scrollIdeal = (menuPadding + (selectedRow + 1) * rowHeight) -
-      (-1 * top + wrapperPadding + inputHeight);
-    scrollMax = numRows * rowHeight + 2 * menuPadding - height;
+    scrollIdeal = top + p + selectedRow * rowHeight;
+    scrollMax = numRows * rowHeight + 2 * p - height;
     scrollTop = Math.min(scrollIdeal, scrollMax);
   }
 
@@ -214,7 +213,7 @@ module.exports = {
   getMenuPositionalCSS: getMenuPositionalCSSFn
 };
 
-},{}],5:[function(require,module,exports){
+},{"./jqLite":5}],5:[function(require,module,exports){
 /**
  * MUI CSS/JS jqLite module
  * @module lib/jqLite
@@ -1574,7 +1573,9 @@ function Menu(wrapperEl, selectEl, wrapperCallbackFn) {
   this.currentPos = null;
   this.selectEl = selectEl;
   this.wrapperEl = wrapperEl;
-  this.menuEl = this._createMenuEl(wrapperEl, selectEl);
+
+  var res = this._createMenuEl(wrapperEl, selectEl),
+      menuEl = this.menuEl = res[0];
 
   var cb = util.callback;
 
@@ -1584,11 +1585,20 @@ function Menu(wrapperEl, selectEl, wrapperCallbackFn) {
 
   // add to DOM
   wrapperEl.appendChild(this.menuEl);
-  jqLite.scrollTop(this.menuEl, this.menuEl._scrollTop);
+
+  // set position
+  var props = formlib.getMenuPositionalCSS(
+    wrapperEl,
+    menuEl,
+    res[1]
+  );
+  
+  jqLite.css(menuEl, props);
+  jqLite.scrollTop(menuEl, props.scrollTop);
 
   // attach event handlers
   var destroyCB = this.destroyCB;
-  jqLite.on(this.menuEl, 'click', this.onClickCB);
+  jqLite.on(menuEl, 'click', this.onClickCB);
   jqLite.on(win, 'resize', destroyCB);
 
   // attach event handler after current event loop exits
@@ -1608,6 +1618,7 @@ Menu.prototype._createMenuEl = function(wrapperEl, selectEl) {
       origPos = -1,
       selectedPos = 0,
       selectedRow = 0,
+      numRows = 0,
       docFrag = document.createDocumentFragment(),  // for speed
       loopEl,
       rowEl,
@@ -1658,7 +1669,7 @@ Menu.prototype._createMenuEl = function(wrapperEl, selectEl) {
 
         // handle selected options
         if (loopEl.selected) {
-          selectedRow = menuEl.children.length;
+          selectedRow = numRows;
           origPos = itemPos;
           selectedPos = itemPos;
         }
@@ -1669,6 +1680,7 @@ Menu.prototype._createMenuEl = function(wrapperEl, selectEl) {
       }
 
       docFrag.appendChild(rowEl);
+      numRows += 1;
     }
   }
 
@@ -1682,17 +1694,7 @@ Menu.prototype._createMenuEl = function(wrapperEl, selectEl) {
   // paint selectedPos
   if (itemArray.length) jqLite.addClass(itemArray[selectedPos], selectedClass);
 
-  // set position
-  var props = formlib.getMenuPositionalCSS(
-    wrapperEl,
-    menuEl.children.length,
-    selectedRow
-  );
-
-  jqLite.css(menuEl, props);
-  menuEl._scrollTop = props.scrollTop;
-
-  return menuEl;
+  return [menuEl, selectedRow];
 }
 
 

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

@@ -126,8 +126,8 @@ $xFormLabelLineHeight: floor($mui-label-font-size * 1.25);
 
   > div {
     padding: 0 22px;
-    height: $mui-select-menu-font-size + 26px;
-    line-height: $mui-select-menu-font-size + 26px;
+    height: $mui-select-menu-item-height;
+    line-height: $mui-select-menu-item-height;
     cursor: pointer;
     white-space: nowrap;
 

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

@@ -191,8 +191,9 @@ $mui-form-group-margin-bottom:    20px !default;
 // SELECT
 // ============================================================================
 
-$mui-select-menu-font-size:              $mui-input-font-size !default;
-$mui-select-menu-bg-color:               mui-color('white') !default;
+$mui-select-menu-font-size:       $mui-input-font-size !default;
+$mui-select-menu-bg-color:        mui-color('white') !default;
+$mui-select-menu-item-height:     $mui-select-menu-font-size + 26px !default;
 $mui-select-menu-item-bg-color-selected: mui-color('grey', '200') !default;
 $mui-select-menu-item-bg-color-hover:    mui-color('grey', '300') !default;
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mui-sass
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.9.28
 platform: ruby
 authors:
 - Dmitriy Tarasov