From f0d6a5872fb09bd23a78d871de7288e751955477 Mon Sep 17 00:00:00 2001 From: Mark Salsbery Date: Mon, 25 Nov 2013 09:30:49 -0800 Subject: [PATCH] OpenSeadragon.version property change grunt property name changed to be more OpenSeadragon-specific --- Gruntfile.js | 2 +- src/openseadragon.js | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 80d133e1..5243921a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -55,7 +55,7 @@ module.exports = function(grunt) { // Project configuration. grunt.initConfig({ pkg: packageJson, - version: { + osdVersion: { versionStr: packageJson.version, major: parseInt(packageJson.version.split('.')[0]), minor: parseInt(packageJson.version.split('.')[1]), diff --git a/src/openseadragon.js b/src/openseadragon.js index f1e6ba8c..368646ee 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -280,18 +280,17 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ /** * The OpenSeadragon version. * - * @member {Object} version - * @memberof OpenSeadragon + * @member {Object} OpenSeadragon.version * @property {String} versionStr - The version number as a string ('major.minor.revision'). * @property {Number} major - The major version number. * @property {Number} minor - The minor version number. * @property {Number} revision - The revision number. */ $.version = { - versionStr: '<%= version.versionStr %>', - major: parseInt('<%= version.major %>'), - minor: parseInt('<%= version.minor %>'), - revision: parseInt('<%= version.revision %>') + versionStr: '<%= osdVersion.versionStr %>', + major: parseInt('<%= osdVersion.major %>'), + minor: parseInt('<%= osdVersion.minor %>'), + revision: parseInt('<%= osdVersion.revision %>') };