Merge pull request #42 from wangyateng/master

添加一个amd条件,避免 define出错
layui · Feb 25, 2017 · 896c733 · 896c733
2 parents 70cb698 + 9b7b93f
commit 896c733
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/layer.js b/src/layer.js
@@ -1227,7 +1227,7 @@ window.layui && layui.define ? (
     exports('layer', layer);
   })
 ) : (
-  typeof define === 'function' ? define(['jquery'], function(){ //requirejs加载
+  (typeof define === 'function' && define.amd) ? define(['jquery'], function(){ //requirejs加载
     ready.run(window.jQuery);
     return layer;
   }) : function(){ //普通script标签加载
@@ -1236,4 +1236,4 @@ window.layui && layui.define ? (
   }()
 );
 
-}(window);
+}(window);