Merge pull request #42 from wangyateng/master

添加一个amd条件,避免 define出错
2017-02-25 14:06:36 +08:00 · 2017-02-25 14:06:36 +08:00 · 896c733fed
parent 70cb6982f8 9b7b93f4b3
commit 896c733fed
1 changed files with 2 additions and 2 deletions
--- 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标签加载