mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-25 06:36:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1099 from avandecreme/fix-version-object

Browse Source 
Fix version object not filled. Fix #1024
This commit is contained in:
Ian Gilman 2017-01-16 10:43:52 -08:00 committed by GitHub
commit e0b4547143
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.vscode/settings.json vendored
View File

@ -1,8 +1,5 @@
// Place your settings in this file to overwrite default and user settings. // 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. // The number of spaces a tab is equal to.
"editor.tabSize": 4, "editor.tabSize": 4,
@ -15,12 +12,6 @@
// Columns at which to show vertical rulers // Columns at which to show vertical rulers
"editor.rulers": [80], "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. // The default character set encoding to use when reading and writing files.
"files.encoding": "utf8", "files.encoding": "utf8",

5
Gruntfile.js
View File

@ -123,10 +123,11 @@ module.exports = function(grunt) {
join_vars: false join_vars: false
}, },
sourceMap: true, sourceMap: true,
sourceMapName: 'build/openseadragon/openseadragon.min.js.map' sourceMapName: 'build/openseadragon/openseadragon.min.js.map',
sourceMapIn: 'build/openseadragon/openseadragon.js.map'
}, },
openseadragon: { openseadragon: {
src: sources, src: distribution,
dest: minified dest: minified
} }
}, },

4
package.json
View File

@ -18,10 +18,10 @@
"grunt": "^0.4.5", "grunt": "^0.4.5",
"grunt-contrib-clean": "^0.7.0", "grunt-contrib-clean": "^0.7.0",
"grunt-contrib-compress": "^0.13.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-connect": "^0.11.2",
"grunt-contrib-jshint": "^0.11.0", "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-contrib-watch": "^0.6.1",
"grunt-git-describe": "^2.3.2", "grunt-git-describe": "^2.3.2",
"grunt-qunit-istanbul": "^0.6.0", "grunt-qunit-istanbul": "^0.6.0",

8
test/modules/basic.js
View File

@ -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");
});
})(); })();

2
test/test.html
View File

@ -14,7 +14,7 @@
<script src="/test/lib/jquery-1.9.1.min.js"></script> <script src="/test/lib/jquery-1.9.1.min.js"></script>
<script src="/test/lib/jquery-ui-1.10.2/js/jquery-ui-1.10.2.min.js"></script> <script src="/test/lib/jquery-ui-1.10.2/js/jquery-ui-1.10.2.min.js"></script>
<script src="/test/lib/jquery.simulate.js"></script> <script src="/test/lib/jquery.simulate.js"></script>
<script src="/build/openseadragon/openseadragon.js"></script> <script src="/build/openseadragon/openseadragon.min.js"></script>
<script src="/test/helpers/legacy.mouse.shim.js"></script> <script src="/test/helpers/legacy.mouse.shim.js"></script>
<script src="/test/helpers/test.js"></script> <script src="/test/helpers/test.js"></script>
<script src="/test/helpers/touch.js"></script> <script src="/test/helpers/touch.js"></script>