Merge 11cd9fb9cb into 56006aee51

.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/
+*.*~

src/layer.js

@@ -1242,9 +1242,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.endCallback === 'function' && options.endCallback();
       }
     }, options));
   }, function(){