Merge branch 'master' into raf

Fixed Conflicts: src/viewer.js
2025-04-03 13:53:31 +03:00 · 2013-06-19 11:19:54 -07:00 · 2013-06-19 11:19:54 -07:00 · 8e88f36098
commit 8e88f36098
parent 2c2d1486cd b7eec5d60a
31 changed files with 975 additions and 974 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -131,6 +131,7 @@ module.exports = function(grunt) {
                browser: true,
                eqeqeq: false,
                loopfunc: false,
+                trailing: true,
                globals: {
                    OpenSeadragon: true
                }