mui-sass 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 611f5bb7db3d89f99ea3570b356d32d8df107219
-  data.tar.gz: 017f19e6cf0aef2bc414a5e357276acde6f4d645
+  metadata.gz: 91a5cebca7469d407e8a6be7552bf98821f14c9c
+  data.tar.gz: 25ad2199a8d4a469cd2ed7568b8e384be0d0f19d
 SHA512:
-  metadata.gz: 887aa81ffb2778dd2927c2a4c50de61c8941aa06056d3f2bfa93855c05fef8533245f92365d62156d17e6c1980e8a0c2a421f54f4288c164237fb8947342d69b
-  data.tar.gz: 2ae48990a5eb3d48b211c96046274f218047dc37d8ffec4e6e1e164d1f903fa1aa114502acf68dde772648c3a99ed6e61f233935e86ecf819e757881ac6060fc
+  metadata.gz: 19707a144ac4038997d2df51b4dd81b5c146b6671aa572f8c60961094e7c76eb1895e8ac487f078daf54e596631aa6bea0cc028a01e27123397c6ca5ef2332ef
+  data.tar.gz: 97b03aa65eef7516759b672d843dae3e8a9666c6b7377cc942998736aeca8384b92b604033edc4efe59d6dbe93a17c937b24c65ff7270c1946028e32c26a1ba3

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 rvm:
   - 2.2.6
   - 2.3.3
-  - 2.4.0-preview3
+  - 2.4.0
 
 before_install: gem install bundler
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.8 (2017-01-13)
+
+- Update assets to match upstream version
+
 ## 0.9.6 (2016-12-20)
 
 - Update assets to match upstream version

data/lib/mui/sass/version.rb

@@ -1,5 +1,5 @@
 module Mui
   module Sass
-    VERSION = '0.9.6'
+    VERSION = '0.9.8'
   end
 end

data/vendor/assets/javascripts/mui.js

@@ -625,8 +625,10 @@ var config = require('../config'),
     jqLite = require('./jqLite'),
     scrollLock = 0,
     scrollLockCls = 'mui-scroll-lock',
+    scrollLockPos,
     scrollStyleEl,
     scrollEventHandler,
+    _scrollBarWidth,
     _supportsPointerEvents;
 
 
@@ -766,29 +768,30 @@ function enableScrollLockFn() {
   
   // add lock
   if (scrollLock === 1) {
-    var htmlEl = document.documentElement,
-        top = jqLite.scrollTop(window),
-        left = jqLite.scrollLeft(window),
+    var doc = document,
+        win = window,
+        htmlEl = doc.documentElement,
+        bodyEl = doc.body,
+        scrollBarWidth = getScrollBarWidth(),
         cssProps,
-        cssStr;
+        cssStr,
+        x;
 
     // define scroll lock class dynamically
-    cssProps = [
-      'position:fixed',
-      'top:' + -top + 'px',
-      'right:0',
-      'bottom:0',
-      'left:' + -left + 'px'
-    ];
-
-    // scrollbar-y
-    if (htmlEl.scrollHeight > htmlEl.clientHeight) {
-      cssProps.push('overflow-y:scroll');
-    }
+    cssProps = ['overflow:hidden'];
+
+    if (scrollBarWidth) {
+      // scrollbar-y
+      if (htmlEl.scrollHeight > htmlEl.clientHeight) {
+        x = parseInt(jqLite.css(bodyEl, 'padding-right')) + scrollBarWidth;
+        cssProps.push('padding-right:' + x + 'px');
+      }
     
-    // scrollbar-x
-    if (htmlEl.scrollWidth > htmlEl.clientWidth) {
-      cssProps.push('overflow-x:scroll');
+      // scrollbar-x
+      if (htmlEl.scrollWidth > htmlEl.clientWidth) {
+        x = parseInt(jqLite.css(bodyEl, 'padding-bottom')) + scrollBarWidth;
+        cssProps.push('padding-bottom:' + x + 'px');
+      }
     }
 
     // define css class dynamically
@@ -797,10 +800,11 @@ function enableScrollLockFn() {
     scrollStyleEl = loadStyleFn(cssStr);
 
     // cancel 'scroll' event listener callbacks
-    jqLite.on(window, 'scroll', scrollEventHandler, true);
+    jqLite.on(win, 'scroll', scrollEventHandler, true);
 
     // add scroll lock
-    jqLite.addClass(htmlEl, scrollLockCls);
+    scrollLockPos = {left: jqLite.scrollLeft(win), top: jqLite.scrollTop(win)};
+    jqLite.addClass(bodyEl, scrollLockCls);
   }
 }
 
@@ -818,22 +822,42 @@ function disableScrollLockFn(resetPos) {
 
   // remove lock 
   if (scrollLock === 0) {
-    var htmlEl = document.documentElement,
-        top = parseInt(jqLite.css(htmlEl, 'top')),
-        left = parseInt(jqLite.css(htmlEl, 'left'));
-
     // remove scroll lock and delete style element
-    jqLite.removeClass(htmlEl, scrollLockCls);
+    jqLite.removeClass(document.body, scrollLockCls);
     scrollStyleEl.parentNode.removeChild(scrollStyleEl);
 
     // restore scroll position
-    window.scrollTo(-left, -top);      
+    if (resetPos) window.scrollTo(scrollLockPos.left, scrollLockPos.top);
 
     // restore scroll event listeners
     jqLite.off(window, 'scroll', scrollEventHandler, true);
   }
 }
 
+/**
+ * Return scroll bar width.
+ */
+var getScrollBarWidth = function() {
+  // check cache
+  if (_scrollBarWidth !== undefined) return _scrollBarWidth;
+  
+  // calculate scroll bar width
+  var doc = document,
+      bodyEl = doc.body,
+      el = doc.createElement('div');
+
+  el.innerHTML = '<div style="width:50px;height:50px;position:absolute;' + 
+    'left:-50px;top:-50px;overflow:auto;"><div style="width:1px;' + 
+    'height:100px;"></div></div>';
+  el = el.firstChild;
+  bodyEl.appendChild(el);
+  _scrollBarWidth = el.offsetWidth - el.clientWidth;
+  bodyEl.removeChild(el);
+
+  return _scrollBarWidth;
+}
+
+
 /**
  * requestAnimationFrame polyfilled
  * @param {Function} callback - The callback function
@@ -1931,6 +1955,9 @@ function initialize(inputEl) {
 
   // add dirty class on focus
   jqLite.on(inputEl, 'focus', function() {jqLite.addClass(this, dirtyClass);});
+
+  // add dirty class if element is currently focused
+  if (document.activeElement === inputEl) jqLite.addClass(inputEl, dirtyClass);
 }
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mui-sass
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
 platform: ruby
 authors:
 - Dmitriy Tarasov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass