From 4ef7a7402628cc0d391bbc5bccf57191de2e0f1c Mon Sep 17 00:00:00 2001 From: shangyidong Date: Wed, 26 Apr 2017 11:18:08 +0800 Subject: [PATCH 1/3] first commit --- .gitignore | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4152923 --- /dev/null +++ b/.gitignore @@ -0,0 +1,72 @@ +/ws/* + +# should not ignored # +!*.java +!*.gitignore +!*.xml +!*.jsp +!*.html +!*.htm +!*.js +!*.css +!*.jpg +!*.gif +!*.properties + + +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip +*.war +*.ear + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +# OS generated files # +###################### +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +Icon? +ehthumbs.db +Thumbs.db + +# eclipse generated files # +###################### +.project +.classpath +.iml +*.iml +.settings/ +.idea/ + +# temp folder # +###################### +target/ +classes/ +bin/ +*.*~ From e7f28bceb257fe8ebf488127e64716c8ccf7b5a5 Mon Sep 17 00:00:00 2001 From: shangyidong Date: Wed, 26 Apr 2017 11:19:58 +0800 Subject: [PATCH 2/3] add --- src/layer.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/layer.js b/src/layer.js index 0cc4e0d..5e0fafb 100644 --- a/src/layer.js +++ b/src/layer.js @@ -1042,7 +1042,11 @@ layer.photos = function(options, loop, key){ options.img = options.img || 'img'; var success = options.success; - delete options.success; + /* + 闲心的源码中有以下这句,删除了options中的success方法,所以不会在下面的success回调中执行传进来的回调函数 + 删除这里的注释,就可以在下面的success回调中执行options中传入的回调函数 + */ + //delete options.success; if(!type){ //页面直接获取 var parent = $(options.photos), pushData = function(){ @@ -1217,11 +1221,18 @@ layer.photos = function(options, loop, key){ dict.imgsee = layero.find('.layui-layer-imguide,.layui-layer-imgbar'); dict.event(layero); options.tab && options.tab(data[start], layero); + /* + 此处执行options中传入的success回调函数 + */ typeof success === 'function' && success(layero); }, end: function(){ dict.end = true; $(document).off('keyup', dict.keyup); - } + /* + 此处执行options中传入的end回调函数 + */ + typeof end === 'function' && end(); + } }, options)); }, function(){ layer.close(dict.loadi); From bd0e2c1c2fef1e7aa977b3409796dcd3c769cc49 Mon Sep 17 00:00:00 2001 From: shangyidong Date: Wed, 26 Apr 2017 11:20:43 +0800 Subject: [PATCH 3/3] update photo plugin --- src/layer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layer.js b/src/layer.js index 5e0fafb..be65420 100644 --- a/src/layer.js +++ b/src/layer.js @@ -1232,7 +1232,7 @@ layer.photos = function(options, loop, key){ 此处执行options中传入的end回调函数 */ typeof end === 'function' && end(); - } + } }, options)); }, function(){ layer.close(dict.loadi);