diff --git a/.vscode/settings.json b/.vscode/settings.json
index 752fa89f..686e7452 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,8 +1,5 @@
// Place your settings in this file to overwrite default and user settings.
{
- // Controls the font size.
- "editor.fontSize": 14,
-
// The number of spaces a tab is equal to.
"editor.tabSize": 4,
@@ -15,12 +12,6 @@
// Columns at which to show vertical rulers
"editor.rulers": [80],
- // Controls after how many characters the editor will wrap to the next line. Setting this to 0 turns on viewport width wrapping
- "editor.wrappingColumn": 0,
-
- // Controls the indentation of wrapped lines. Can be one of 'none', 'same' or 'indent'.
- "editor.wrappingIndent": "none",
-
// The default character set encoding to use when reading and writing files.
"files.encoding": "utf8",
diff --git a/Gruntfile.js b/Gruntfile.js
index d1e86ae2..a48002b1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -123,10 +123,11 @@ module.exports = function(grunt) {
join_vars: false
},
sourceMap: true,
- sourceMapName: 'build/openseadragon/openseadragon.min.js.map'
+ sourceMapName: 'build/openseadragon/openseadragon.min.js.map',
+ sourceMapIn: 'build/openseadragon/openseadragon.js.map'
},
openseadragon: {
- src: sources,
+ src: distribution,
dest: minified
}
},
diff --git a/package.json b/package.json
index 19bd4d21..a1fe2301 100644
--- a/package.json
+++ b/package.json
@@ -18,10 +18,10 @@
"grunt": "^0.4.5",
"grunt-contrib-clean": "^0.7.0",
"grunt-contrib-compress": "^0.13.0",
- "grunt-contrib-concat": "^0.5.1",
+ "grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "^0.11.2",
"grunt-contrib-jshint": "^0.11.0",
- "grunt-contrib-uglify": "^0.11.0",
+ "grunt-contrib-uglify": "^2.0.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-git-describe": "^2.3.2",
"grunt-qunit-istanbul": "^0.6.0",
diff --git a/test/modules/basic.js b/test/modules/basic.js
index 4d787ab4..7dc2a9ef 100644
--- a/test/modules/basic.js
+++ b/test/modules/basic.js
@@ -423,4 +423,12 @@
});
} );
+
+ test('version object', function() {
+ equal(typeof OpenSeadragon.version.versionStr, "string", "versionStr should be a string");
+ ok(OpenSeadragon.version.major >= 0, "major should be a positive number");
+ ok(OpenSeadragon.version.minor >= 0, "minor should be a positive number");
+ ok(OpenSeadragon.version.revision >= 0, "revision should be a positive number");
+ });
+
})();
diff --git a/test/test.html b/test/test.html
index 74495ff6..985dcb3e 100644
--- a/test/test.html
+++ b/test/test.html
@@ -14,7 +14,7 @@
-
+