Merge pull request #1311 from layui/main

同步主干最新变更到 2.x

src/css/layui.css

@@ -567,7 +567,7 @@ a cite{font-style: normal; *cursor:pointer;}
 
 /* 其它辅助 */
 .layui-auxiliar-moving{position: fixed; left: 0; right: 0; top: 0; bottom: 0; width: 100%; height: 100%; background: none; z-index: 9999999999;}
-.layui-scollbar-hide{overflow: hidden !important;}
+.layui-scrollbar-hide{overflow: hidden !important;}
 
 
 /*

src/modules/code.js

@@ -167,18 +167,18 @@ layui.define(['lay', 'util', 'element', 'form'], function(exports){
               var classNameRestore = 'layui-icon-screen-restore';
               var title = this.title;
               var html = $('html,body');
-              var ELEM_SCOLLBAR_HIDE = 'layui-scollbar-hide';
+              var ELEM_SCROLLBAR_HIDE = 'layui-scrollbar-hide';
 
               if(el.hasClass(classNameFull)){
                 elemView.addClass(CONST.ELEM_FULL);
                 el.removeClass(classNameFull).addClass(classNameRestore);
                 el.attr('title', title[1]);
-                html.addClass(ELEM_SCOLLBAR_HIDE);
+                html.addClass(ELEM_SCROLLBAR_HIDE);
               } else {
                 elemView.removeClass(CONST.ELEM_FULL);
                 el.removeClass(classNameRestore).addClass(classNameFull);
                 el.attr('title', title[0]);
-                html.removeClass(ELEM_SCOLLBAR_HIDE);
+                html.removeClass(ELEM_SCROLLBAR_HIDE);
               }
             }
           },

src/modules/layer.js

@@ -960,7 +960,7 @@ ready.record = function(layero){
   layero.attr({area: area});
 };
 
-ready.rescollbar = function(index){
+ready.rescrollbar = function(index){
   if(doms.html.attr('layer-full') == index){
     if(doms.html[0].style.removeProperty){
       doms.html[0].style.removeProperty('overflow');
@@ -1097,7 +1097,7 @@ layer.min = function(index, options){
 
   elemMin.hide();
   layero.attr('type') === 'page' && layero.find(doms[4]).hide();
-  ready.rescollbar(index);
+  ready.rescrollbar(index);
 
   // 隐藏遮罩
   shadeo.hide();
@@ -1125,7 +1125,7 @@ layer.restore = function(index){
   layero.find('.layui-layer-max').removeClass('layui-layer-maxmin');
   layero.find('.layui-layer-min').show();
   type === 'page' && layero.find(doms[4]).show();
-  ready.rescollbar(index);
+  ready.rescrollbar(index);
   
   // 恢复遮罩
   shadeo.show();
@@ -1243,7 +1243,7 @@ layer.close = function(index, callback){
   }
   
   layer.ie == 6 && ready.reselect();
-  ready.rescollbar(index); 
+  ready.rescrollbar(index); 
   
   // 记住被关闭层的最小化堆叠坐标
   if(typeof layero.attr('minLeft') === 'string'){