From a585ba990e0cb6c4e1adb56c901fbb37df74a0b5 Mon Sep 17 00:00:00 2001 From: shangyidong Date: Wed, 26 Apr 2017 13:27:10 +0800 Subject: [PATCH 1/2] update photo --- .gitignore | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/layer.js | 2 ++ 2 files changed, 74 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..41529238 --- /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/ +*.*~ diff --git a/src/layer.js b/src/layer.js index 0cc4e0d8..b7eeeff2 100644 --- a/src/layer.js +++ b/src/layer.js @@ -1218,9 +1218,11 @@ layer.photos = function(options, loop, key){ dict.event(layero); options.tab && options.tab(data[start], layero); typeof success === 'function' && success(layero); + typeof options.successCallback === 'function' && options.successCallback(); }, end: function(){ dict.end = true; $(document).off('keyup', dict.keyup); + typeof options.successCallback === 'function' && options.endCallback(); } }, options)); }, function(){ From 11cd9fb9cb8d030e3a98a7203119e5073dc45af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=95=86=E5=95=86?= Date: Fri, 8 Sep 2017 19:58:36 +0800 Subject: [PATCH 2/2] Update layer.js --- src/layer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layer.js b/src/layer.js index b7eeeff2..43b814fa 100644 --- a/src/layer.js +++ b/src/layer.js @@ -1222,7 +1222,7 @@ layer.photos = function(options, loop, key){ }, end: function(){ dict.end = true; $(document).off('keyup', dict.keyup); - typeof options.successCallback === 'function' && options.endCallback(); + typeof options.endCallback === 'function' && options.endCallback(); } }, options)); }, function(){