Merge branch 'master' of https://github.com/sentsin/layui

merge
2017-09-20 00:25:15 +08:00
parent 8e74948e39 bc1d4706bd
commit a9f85a840b
7 changed files with 1672 additions and 151 deletions
--- a/src/lay/modules/laydate.js
+++ b/src/lay/modules/laydate.js
@@ -162,7 +162,7 @@
  
  //中止冒泡
  lay.stope = function(e){
-    e = e || win.event;
+    e = e || window.event;
    e.stopPropagation 
      ? e.stopPropagation() 
    : e.cancelBubble = true;