From 530e445756a6ebd111ecde4bb0d7f7b1135ab93d Mon Sep 17 00:00:00 2001 From: Heath Nielson Date: Wed, 3 Apr 2013 12:33:47 -0600 Subject: [PATCH 01/71] Fix a problem with getString when the string property is a sub-property. --- src/strings.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/strings.js b/src/strings.js index 16f2df8a..22a4cb48 100644 --- a/src/strings.js +++ b/src/strings.js @@ -45,12 +45,14 @@ $.extend( $, { var props = prop.split('.'), string = null, args = arguments, + container = I18N, i; - for ( i = 0; i < props.length; i++ ) { + for ( i = 0; i < props.length-1; i++ ) { // in case not a subproperty - string = I18N[ props[ i ] ] || {}; + container = container[ props[ i ] ] || {}; } + string = container[ props[ i ] ]; if ( typeof( string ) != "string" ) { string = ""; From fdeaa100851fdecd98ea608f918b080f81c39438 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Mon, 8 Apr 2013 10:28:56 -0700 Subject: [PATCH 02/71] Updated github page link --- Gruntfile.js | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index e20b5e7c..fda8fd6b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -64,7 +64,7 @@ module.exports = function(grunt) { banner: "//! <%= pkg.name %> <%= pkg.version %>\n" + "//! Built on <%= grunt.template.today('yyyy-mm-dd') %>\n" + "//! Git commit: <%= gitInfo %>\n" - + "//! http://openseadragon.github.com\n\n", + + "//! http://openseadragon.github.io\n\n", process: true }, dist: { diff --git a/README.md b/README.md index 3c194552..c3f66385 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This project is a fork of the OpenSeadragon project at http://openseadragon.code ## On the Web -http://openseadragon.github.com/ +http://openseadragon.github.io/ ## First Time Setup From 5383ce7e61a784c006b2903709fa8d5c6087dc12 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 20 Apr 2013 03:38:10 -0400 Subject: [PATCH 03/71] Fix one more place where we define ourselves as a fork --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c3f66385..bd7557ab 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # OpenSeadragon -This project is a fork of the OpenSeadragon project at http://openseadragon.codeplex.com/ +An open-source, web-based viewer for zoomable images, implemented in pure JavaScript. ## On the Web From 63c24aa56312c702f95fda26f6c5e859ba43944b Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Mon, 22 Apr 2013 10:32:23 -0700 Subject: [PATCH 04/71] Build info on readme --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bd7557ab..53d8f2e9 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,13 @@ An open-source, web-based viewer for zoomable images, implemented in pure JavaScript. -## On the Web +Find examples, documentation, and builds at http://openseadragon.github.io/. -http://openseadragon.github.io/ +## Stable Build + +[Zip](http://openseadragon.github.io/openseadragon.zip) + +[Tar](http://openseadragon.github.io/openseadragon.tar) ## First Time Setup From ee02dda56ed34ad1e4435cad8b27665cf07ad6e1 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Mon, 22 Apr 2013 10:34:26 -0700 Subject: [PATCH 05/71] Wording tweaks --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 53d8f2e9..2bffeb30 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,11 @@ An open-source, web-based viewer for zoomable images, implemented in pure JavaScript. -Find examples, documentation, and builds at http://openseadragon.github.io/. +See it in action at http://openseadragon.github.io/. ## Stable Build -[Zip](http://openseadragon.github.io/openseadragon.zip) - -[Tar](http://openseadragon.github.io/openseadragon.tar) +The latest stable builds are here: [Zip](http://openseadragon.github.io/openseadragon.zip) or [Tar](http://openseadragon.github.io/openseadragon.tar). ## First Time Setup From d7224f8206e5b08fc9f03c3599f2c9d4bd308a46 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 22 Apr 2013 20:13:42 -0400 Subject: [PATCH 06/71] Compress package tarballs with gzip Tar files are conventionally compressed, often with gzip. xz would be better but is not as universally supported; in particular, grunt-contrib-compress doesn't support it. --- Gruntfile.js | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index fda8fd6b..8746c0b6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -92,7 +92,7 @@ module.exports = function(grunt) { }, tar: { options: { - archive: "build/openseadragon.tar" + archive: "build/openseadragon.tar.gz" }, files: [ { expand: true, cwd: "build/", src: [ "openseadragon/**" ] } @@ -177,7 +177,7 @@ module.exports = function(grunt) { // ---------- // Package task. - // Builds and creates the .zip and .tar files. + // Builds and creates the .zip and .tar.gz files. grunt.registerTask("package", ["build", "compress"]); // ---------- diff --git a/README.md b/README.md index 2bffeb30..5ccbbae3 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ See it in action at http://openseadragon.github.io/. ## Stable Build -The latest stable builds are here: [Zip](http://openseadragon.github.io/openseadragon.zip) or [Tar](http://openseadragon.github.io/openseadragon.tar). +The latest stable builds are here: [Zip](http://openseadragon.github.io/openseadragon.zip) or [Tar](http://openseadragon.github.io/openseadragon.tar.gz). ## First Time Setup @@ -42,7 +42,7 @@ You can also publish the built version to the site-build repository. This assume grunt publish -... which will delete the existing openseadragon folder, along with the .zip and .tar files, out of the site-build folder and replace them with newly built ones from the source in this repository; you'll then need to commit the changes to site-build. +... which will delete the existing openseadragon folder, along with the .zip and .tar.gz files, out of the site-build folder and replace them with newly built ones from the source in this repository; you'll then need to commit the changes to site-build. ## Testing From 551215404dc93df3e3b387681be705714582de97 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 19 Apr 2013 01:01:15 -0400 Subject: [PATCH 07/71] Use maximum compression when creating packages grunt-contrib-compress defaults to minimum compression. --- Gruntfile.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 8746c0b6..25fcc3c3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -84,7 +84,8 @@ module.exports = function(grunt) { compress: { zip: { options: { - archive: "build/openseadragon.zip" + archive: "build/openseadragon.zip", + level: 9 }, files: [ { expand: true, cwd: "build/", src: ["openseadragon/**"] } @@ -92,7 +93,8 @@ module.exports = function(grunt) { }, tar: { options: { - archive: "build/openseadragon.tar.gz" + archive: "build/openseadragon.tar.gz", + level: 9 }, files: [ { expand: true, cwd: "build/", src: [ "openseadragon/**" ] } From 739ff2dbedc0a1f54b5a0322b07ac28bcd9a5c8d Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 22 Apr 2013 20:20:07 -0400 Subject: [PATCH 08/71] Rename {tar,zip}ball and packaged directory {Tar,zip}balls now have the form openseadragon-bin-0.9.125.{tar.gz,zip}, containing a directory openseadragon-bin-0.9.125. Including the project's version number makes it easy to determine the version of a random release sitting around a filesystem, and ensures that unpacking a tarball won't overwrite another unpacked tarball or write into a checked-out repo. Adding -bin distinguishes the packages from source tarballs, which are conventionally -.{tar.gz,zip}. --- Gruntfile.js | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 25fcc3c3..8db4a1e9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,8 +12,11 @@ module.exports = function(grunt) { grunt.loadNpmTasks("grunt-git-describe"); // ---------- - var distribution = "build/openseadragon/openseadragon.js", + var packageJson = grunt.file.readJSON("package.json"), + distribution = "build/openseadragon/openseadragon.js", minified = "build/openseadragon/openseadragon.min.js", + packageDirName = "openseadragon-bin-" + packageJson.version, + packageDir = "build/" + packageDirName + "/", releaseRoot = "../site-build/built-openseadragon/", sources = [ "src/openseadragon.js", @@ -49,9 +52,10 @@ module.exports = function(grunt) { // ---------- // Project configuration. grunt.initConfig({ - pkg: grunt.file.readJSON("package.json"), + pkg: packageJson, clean: { build: ["build"], + "package": [packageDir], release: { src: [releaseRoot], options: { @@ -84,20 +88,20 @@ module.exports = function(grunt) { compress: { zip: { options: { - archive: "build/openseadragon.zip", + archive: "build/" + packageDirName + ".zip", level: 9 }, files: [ - { expand: true, cwd: "build/", src: ["openseadragon/**"] } + { expand: true, cwd: "build/", src: [ packageDirName + "/**" ] } ] }, tar: { options: { - archive: "build/openseadragon.tar.gz", + archive: "build/" + packageDirName + ".tar.gz", level: 9 }, files: [ - { expand: true, cwd: "build/", src: [ "openseadragon/**" ] } + { expand: true, cwd: "build/", src: [ packageDirName + "/**" ] } ] } }, @@ -152,6 +156,18 @@ module.exports = function(grunt) { grunt.file.copy("changelog.txt", "build/changelog.txt"); }); + // ---------- + // Copy:package task. + // Creates a directory tree to be compressed into a package. + grunt.registerTask("copy:package", function() { + grunt.file.recurse("build/openseadragon", function(abspath, rootdir, subdir, filename) { + var dest = packageDir + + (subdir ? subdir + "/" : '/') + + filename; + grunt.file.copy(abspath, dest); + }); + }); + // ---------- // Copy:release task. // Copies the contents of the build folder into the release folder. @@ -180,7 +196,7 @@ module.exports = function(grunt) { // ---------- // Package task. // Builds and creates the .zip and .tar.gz files. - grunt.registerTask("package", ["build", "compress"]); + grunt.registerTask("package", ["build", "copy:package", "compress", "clean:package"]); // ---------- // Publish task. From 15994b688bcc98e8121ddd0e6f87a10fbd3c980d Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 19 Apr 2013 02:40:27 -0400 Subject: [PATCH 09/71] Include changelog and license files in packages A README would be good too, but right now README.md consists mostly of things that are only meaningful in a Git checkout. --- Gruntfile.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index 8db4a1e9..9e6789bd 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -166,6 +166,9 @@ module.exports = function(grunt) { + filename; grunt.file.copy(abspath, dest); }); + grunt.file.copy("changelog.txt", packageDir + "changelog.txt"); + grunt.file.copy("licenses/mit.txt", packageDir + "licenses/mit.txt"); + grunt.file.copy("licenses/new-bsd.txt", packageDir + "licenses/new-bsd.txt"); }); // ---------- From c7c7b202ddb45560e295c964787326e5242a7910 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 22 Apr 2013 20:27:55 -0400 Subject: [PATCH 10/71] Don't delete old releases from the website It's convenient for old releases to be available indefinitely so that deployment scripts can retrieve a particular qualified version. This won't affect the disk space requirements of the repository, since the old packages will be in the Git history anyhow. Move packages to a subdirectory of the site root to avoid causing permanent clutter. --- Gruntfile.js | 6 +++--- README.md | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 9e6789bd..1d597da2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -57,7 +57,7 @@ module.exports = function(grunt) { build: ["build"], "package": [packageDir], release: { - src: [releaseRoot], + src: [releaseRoot + '*', '!' + releaseRoot + 'releases'], options: { force: true } @@ -88,7 +88,7 @@ module.exports = function(grunt) { compress: { zip: { options: { - archive: "build/" + packageDirName + ".zip", + archive: "build/releases/" + packageDirName + ".zip", level: 9 }, files: [ @@ -97,7 +97,7 @@ module.exports = function(grunt) { }, tar: { options: { - archive: "build/" + packageDirName + ".tar.gz", + archive: "build/releases/" + packageDirName + ".tar.gz", level: 9 }, files: [ diff --git a/README.md b/README.md index 5ccbbae3..db8de64e 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,10 @@ An open-source, web-based viewer for zoomable images, implemented in pure JavaSc See it in action at http://openseadragon.github.io/. -## Stable Build +## Stable Builds -The latest stable builds are here: [Zip](http://openseadragon.github.io/openseadragon.zip) or [Tar](http://openseadragon.github.io/openseadragon.tar.gz). +Stable builds of OpenSeadragon releases are available +[here](http://openseadragon.github.io/releases/). ## First Time Setup From 1430ac38fef03b50605b2209c35a743196aa7cfb Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 22 Apr 2013 20:28:13 -0400 Subject: [PATCH 11/71] Drop obsolete .gitignore entries --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index f562c278..4b26396b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ *.sublime-workspace node_modules build/ -openseadragon.zip -openseadragon.tar From eafd707d1a718efbe3dc4d5bca3088cbf949b0aa Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 23 Apr 2013 21:16:33 -0400 Subject: [PATCH 12/71] Drop unnecessary quotes --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1d597da2..40af664e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -55,7 +55,7 @@ module.exports = function(grunt) { pkg: packageJson, clean: { build: ["build"], - "package": [packageDir], + package: [packageDir], release: { src: [releaseRoot + '*', '!' + releaseRoot + 'releases'], options: { From 0d6457027dea9821d7b38b3ffeba5c1880b7367c Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 23 Apr 2013 21:19:04 -0400 Subject: [PATCH 13/71] Stable Builds wording improvement --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index db8de64e..465e3aff 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,7 @@ See it in action at http://openseadragon.github.io/. ## Stable Builds -Stable builds of OpenSeadragon releases are available -[here](http://openseadragon.github.io/releases/). +See our [releases page](http://openseadragon.github.io/releases/). ## First Time Setup From f958e66f05b1e50973d78ff8ee7f8e7bf9669844 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 23 Apr 2013 23:58:58 -0400 Subject: [PATCH 14/71] Fix typo in preserveViewport handling --- src/viewer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/viewer.js b/src/viewer.js index a87c52e9..b6026148 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -1014,7 +1014,7 @@ function openTileSource( viewer, source ) { }); } - if( _this.preserveVewport ){ + if( _this.preserveViewport ){ _this.viewport.resetContentSize( _this.source.dimensions ); } From b315b148c238a3a5944f5409ef351625dc56f578 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 24 Apr 2013 23:57:35 -0400 Subject: [PATCH 15/71] Drop remains of code to show "Loading..." message It calls a method that no longer exists, but only when an impossible condition is true. --- src/viewer.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/viewer.js b/src/viewer.js index b6026148..f0b698b8 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -115,8 +115,6 @@ $.Viewer = function( options ) { THIS[ this.hash ] = { "fsBoundsDelta": new $.Point( 1, 1 ), "prevContainerSize": null, - "lastOpenStartTime": 0, - "lastOpenEndTime": 0, "animating": false, "forceRedraw": false, "mouseInside": false, @@ -956,16 +954,6 @@ function openTileSource( viewer, source ) { _this.close( ); } - // to ignore earlier opens - THIS[ _this.hash ].lastOpenStartTime = +new Date(); - - window.setTimeout( function () { - if ( THIS[ _this.hash ].lastOpenStartTime > THIS[ _this.hash ].lastOpenEndTime ) { - THIS[ _this.hash ].setMessage( $.getString( "Messages.Loading" ) ); - } - }, 2000); - - THIS[ _this.hash ].lastOpenEndTime = +new Date(); _this.canvas.innerHTML = ""; THIS[ _this.hash ].prevContainerSize = $.getElementSize( _this.container ); From 9eb19d6c9c7c1e4e037162db5332a8fc2acb2a18 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 25 Apr 2013 00:23:02 -0400 Subject: [PATCH 16/71] Garbage-collect strings --- src/strings.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/strings.js b/src/strings.js index 16f2df8a..4d98c1e2 100644 --- a/src/strings.js +++ b/src/strings.js @@ -6,21 +6,13 @@ // pythons gettext might be a reasonable approach. var I18N = { Errors: { - Failure: "Sorry, but Seadragon Ajax can't run on your browser!\n" + - "Please try using IE 7 or Firefox 3.\n", Dzc: "Sorry, we don't support Deep Zoom Collections!", Dzi: "Hmm, this doesn't appear to be a valid Deep Zoom Image.", Xml: "Hmm, this doesn't appear to be a valid Deep Zoom Image.", - Empty: "You asked us to open nothing, so we did just that.", ImageFormat: "Sorry, we don't support {0}-based Deep Zoom Images.", Security: "It looks like a security restriction stopped us from " + "loading this Deep Zoom Image.", - Status: "This space unintentionally left blank ({0} {1}).", - Unknown: "Whoops, something inexplicably went wrong. Sorry!" - }, - - Messages: { - Loading: "Loading..." + Status: "This space unintentionally left blank ({0} {1})." }, Tooltips: { From 47aba609403d090b04b144b1e0097e0ea969f7a8 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 25 Apr 2013 00:37:36 -0400 Subject: [PATCH 17/71] Fix timer leak after multiple Viewer.open() calls Keep a counter of Viewer.close() calls in private state and a copy in the timer's closure, and stop the timer when they no longer match. Fixes #76. --- src/viewer.js | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/viewer.js b/src/viewer.js index f0b698b8..bd907f1b 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -115,6 +115,7 @@ $.Viewer = function( options ) { THIS[ this.hash ] = { "fsBoundsDelta": new $.Point( 1, 1 ), "prevContainerSize": null, + "closeCount": 0, "animating": false, "forceRedraw": false, "mouseInside": false, @@ -368,6 +369,8 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, VIEWERS[ this.hash ] = null; delete VIEWERS[ this.hash ]; + THIS[ this.hash ].closeCount++; + this.raiseEvent( 'close', { viewer: this } ); return this; @@ -948,6 +951,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, function openTileSource( viewer, source ) { var _this = viewer, overlay, + closeCount, i; if ( _this.source ) { @@ -1064,7 +1068,12 @@ function openTileSource( viewer, source ) { THIS[ _this.hash ].animating = false; THIS[ _this.hash ].forceRedraw = true; - scheduleUpdate( _this, updateMulti ); + + // Use local copy in closure + closeCount = THIS[ _this.hash ].closeCount; + scheduleUpdate( _this, function(){ + updateMulti( _this, closeCount ); + } ); //Assuming you had programatically created a bunch of overlays //and added them via configuration @@ -1121,9 +1130,7 @@ function scheduleUpdate( viewer, updateFunc, prevUpdateTime ){ deltaTime; if ( THIS[ viewer.hash ].animating ) { - return $.requestAnimationFrame( function(){ - updateFunc( viewer ); - } ); + return $.requestAnimationFrame( updateFunc ); } currentTime = +new Date(); @@ -1132,9 +1139,7 @@ function scheduleUpdate( viewer, updateFunc, prevUpdateTime ){ targetTime = prevUpdateTime + 1000 / 60; deltaTime = Math.max( 1, targetTime - currentTime ); - return $.requestAnimationFrame( function(){ - updateFunc( viewer ); - } ); + return $.requestAnimationFrame( updateFunc ); } @@ -1334,17 +1339,19 @@ function onContainerEnter( tracker, position, buttonDownElement, buttonDownAny ) // Page update routines ( aka Views - for future reference ) /////////////////////////////////////////////////////////////////////////////// -function updateMulti( viewer ) { +function updateMulti( viewer, closeCount ) { var beginTime; - if ( !viewer.source ) { + if ( closeCount !== THIS[ viewer.hash ].closeCount ) { return; } beginTime = +new Date(); updateOnce( viewer ); - scheduleUpdate( viewer, arguments.callee, beginTime ); + scheduleUpdate( viewer, function(){ + updateMulti( viewer, closeCount ); + }, beginTime ); } function updateOnce( viewer ) { From beba155ece87c82f7c72dd6e33c197e9a645cf72 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Fri, 26 Apr 2013 10:06:14 -0700 Subject: [PATCH 18/71] Sublime project now excludes node_modules --- openseadragon.sublime-project | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openseadragon.sublime-project b/openseadragon.sublime-project index b7e30c92..f8e2dd71 100644 --- a/openseadragon.sublime-project +++ b/openseadragon.sublime-project @@ -3,7 +3,13 @@ [ { "path": ".", - "file_exclude_patterns": ["*.sublime-project", "*.sublime-workspace"] + "file_exclude_patterns": [ + "*.sublime-project", + "*.sublime-workspace" + ], + "folder_exclude_patterns": [ + "node_modules" + ] } ], "settings": From 64a10f28df49f8daafbf967441d9607cb520b681 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Fri, 26 Apr 2013 10:06:31 -0700 Subject: [PATCH 19/71] Added note about "good first bug" issues --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 465e3aff..693c49a3 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,8 @@ OpenSeadragon is truly a community project; we welcome your involvement! When contributing, please attempt to match the code style already in the codebase. Note that we use four spaces per indentation stop. For more thoughts on code style, see https://github.com/rwldrn/idiomatic.js/. +If you're new to the project, check out our [good first bug](https://github.com/openseadragon/openseadragon/issues?labels=good+first+bug&page=1&state=open) issues for some places to dip your toe in the water. + ## Licenses OpenSeadragon was initially released with a New BSD License ( preserved below ), while work done by Chris Thatcher is additionally licensed under the MIT License. From d16eb04a8ac9d3b61e6bf8086c973b574c984e15 Mon Sep 17 00:00:00 2001 From: Heath Nielson Date: Fri, 26 Apr 2013 15:18:27 -0600 Subject: [PATCH 20/71] Fix setStrings() with the same fix as getStrings(). Initialize container to I18N. --- src/strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strings.js b/src/strings.js index 22a4cb48..7d990237 100644 --- a/src/strings.js +++ b/src/strings.js @@ -75,7 +75,7 @@ $.extend( $, { setString: function( prop, value ) { var props = prop.split('.'), - container = $.Strings, + container = I18N, i; for ( i = 0; i < props.length - 1; i++ ) { From e98fb410ee93f1c722ff3ccf93e712566bb7e5e4 Mon Sep 17 00:00:00 2001 From: Heath Nielson Date: Fri, 26 Apr 2013 15:19:23 -0600 Subject: [PATCH 21/71] Add some get/setString tests. --- test/strings.js | 29 +++++++++++++++++++++++++++++ test/test.html | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 test/strings.js diff --git a/test/strings.js b/test/strings.js new file mode 100644 index 00000000..61a12d93 --- /dev/null +++ b/test/strings.js @@ -0,0 +1,29 @@ +(function() { + + module("strings"); + test("getSubString", function() { + equal(OpenSeadragon.getString("Errors.Dzi"), + "Hmm, this doesn't appear to be a valid Deep Zoom Image.", + "Read sub-string"); + }); + + test("getInvalidString", function() { + equal(OpenSeadragon.getString("Greeting"), "", + "Handled unset string key"); + equal(OpenSeadragon.getString("Errors"), "", + "Handled requesting parent key"); + }); + + test("setString", function() { + OpenSeadragon.setString("Greeting", "Hello world"); + equal(OpenSeadragon.getString("Greeting"), "Hello world", + "Set a string"); + }); + + test("setSubString", function() { + OpenSeadragon.setString("CustomGreeting.Hello", "Hello world"); + equal(OpenSeadragon.getString("CustomGreeting.Hello"), "Hello world", + "Set a sub-string"); + }); + +})(); diff --git a/test/test.html b/test/test.html index 37a9afe4..6ca53fa2 100644 --- a/test/test.html +++ b/test/test.html @@ -16,5 +16,6 @@ + - \ No newline at end of file + From 23c20e3d5aaa147bdb50b2a358f453d1e3496d27 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 26 Apr 2013 21:48:48 -0400 Subject: [PATCH 22/71] Revert "Fix timer leak after multiple Viewer.open() calls" This should be done with cancelAnimationFrame() instead. This reverts commit 47aba609403d090b04b144b1e0097e0ea969f7a8. --- src/viewer.js | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/viewer.js b/src/viewer.js index bd907f1b..f0b698b8 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -115,7 +115,6 @@ $.Viewer = function( options ) { THIS[ this.hash ] = { "fsBoundsDelta": new $.Point( 1, 1 ), "prevContainerSize": null, - "closeCount": 0, "animating": false, "forceRedraw": false, "mouseInside": false, @@ -369,8 +368,6 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, VIEWERS[ this.hash ] = null; delete VIEWERS[ this.hash ]; - THIS[ this.hash ].closeCount++; - this.raiseEvent( 'close', { viewer: this } ); return this; @@ -951,7 +948,6 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, function openTileSource( viewer, source ) { var _this = viewer, overlay, - closeCount, i; if ( _this.source ) { @@ -1068,12 +1064,7 @@ function openTileSource( viewer, source ) { THIS[ _this.hash ].animating = false; THIS[ _this.hash ].forceRedraw = true; - - // Use local copy in closure - closeCount = THIS[ _this.hash ].closeCount; - scheduleUpdate( _this, function(){ - updateMulti( _this, closeCount ); - } ); + scheduleUpdate( _this, updateMulti ); //Assuming you had programatically created a bunch of overlays //and added them via configuration @@ -1130,7 +1121,9 @@ function scheduleUpdate( viewer, updateFunc, prevUpdateTime ){ deltaTime; if ( THIS[ viewer.hash ].animating ) { - return $.requestAnimationFrame( updateFunc ); + return $.requestAnimationFrame( function(){ + updateFunc( viewer ); + } ); } currentTime = +new Date(); @@ -1139,7 +1132,9 @@ function scheduleUpdate( viewer, updateFunc, prevUpdateTime ){ targetTime = prevUpdateTime + 1000 / 60; deltaTime = Math.max( 1, targetTime - currentTime ); - return $.requestAnimationFrame( updateFunc ); + return $.requestAnimationFrame( function(){ + updateFunc( viewer ); + } ); } @@ -1339,19 +1334,17 @@ function onContainerEnter( tracker, position, buttonDownElement, buttonDownAny ) // Page update routines ( aka Views - for future reference ) /////////////////////////////////////////////////////////////////////////////// -function updateMulti( viewer, closeCount ) { +function updateMulti( viewer ) { var beginTime; - if ( closeCount !== THIS[ viewer.hash ].closeCount ) { + if ( !viewer.source ) { return; } beginTime = +new Date(); updateOnce( viewer ); - scheduleUpdate( viewer, function(){ - updateMulti( viewer, closeCount ); - }, beginTime ); + scheduleUpdate( viewer, arguments.callee, beginTime ); } function updateOnce( viewer ) { From 8cb2714daea991c78823afc1bb1899e22f36c2b8 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 26 Apr 2013 22:32:51 -0400 Subject: [PATCH 23/71] Fix timer leak after multiple Viewer.open() calls, take 2 Track the request ID of the outstanding animation frame and cancel it on Viewer.close(). Fixes #76. --- src/viewer.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/viewer.js b/src/viewer.js index f0b698b8..af4b1822 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -115,6 +115,7 @@ $.Viewer = function( options ) { THIS[ this.hash ] = { "fsBoundsDelta": new $.Point( 1, 1 ), "prevContainerSize": null, + "updateRequestId": null, "animating": false, "forceRedraw": false, "mouseInside": false, @@ -353,7 +354,11 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, * @return {OpenSeadragon.Viewer} Chainable. */ close: function ( ) { - + if ( THIS[ this.hash ].updateRequestId !== null ){ + $.cancelAnimationFrame( THIS[ this.hash ].updateRequestId ); + THIS[ this.hash ].updateRequestId = null; + } + if( this.drawer ){ this.drawer.clearOverlays(); } @@ -1064,7 +1069,7 @@ function openTileSource( viewer, source ) { THIS[ _this.hash ].animating = false; THIS[ _this.hash ].forceRedraw = true; - scheduleUpdate( _this, updateMulti ); + THIS[ _this.hash ].updateRequestId = scheduleUpdate( _this, updateMulti ); //Assuming you had programatically created a bunch of overlays //and added them via configuration @@ -1338,13 +1343,11 @@ function updateMulti( viewer ) { var beginTime; - if ( !viewer.source ) { - return; - } - beginTime = +new Date(); updateOnce( viewer ); - scheduleUpdate( viewer, arguments.callee, beginTime ); + + THIS[ viewer.hash ].updateRequestId = scheduleUpdate( viewer, + arguments.callee, beginTime ); } function updateOnce( viewer ) { From 3652c7066c5521aa1381f1982cbf3dacb0fb29aa Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 29 Apr 2013 13:17:37 -0400 Subject: [PATCH 24/71] Re-add viewer.source check in updateMulti() It should be redundant in normal operation, but may prevent a timer leak in case of a bug in the open/close path. --- src/viewer.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/viewer.js b/src/viewer.js index af4b1822..a47d46d0 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -1343,6 +1343,11 @@ function updateMulti( viewer ) { var beginTime; + if ( !viewer.source ) { + THIS[ viewer.hash ].updateRequestId = null; + return; + } + beginTime = +new Date(); updateOnce( viewer ); From 1c6deafe8bdccc0ce6c34f9286a041fdfe1872c7 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 2 May 2013 09:57:03 -0700 Subject: [PATCH 25/71] Added viewport property to Viewer documentation --- src/viewer.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/viewer.js b/src/viewer.js index a47d46d0..a2e36d6b 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -28,6 +28,8 @@ var THIS = {}, * @param {Seadragon.Overlays[]} options.overlays Array of Seadragon.Overlays, * @param {Seadragon.Controls[]} options.overlayControls An Array of ( TODO: * not sure! ) + * @property {OpenSeadragon.Viewport} viewport The viewer's viewport, where you + * can access zoom, pan, etc. * **/ $.Viewer = function( options ) { From bd0b0972b33969da601ca7194b0a56ad6fcb2509 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 2 May 2013 09:57:23 -0700 Subject: [PATCH 26/71] Fixed bad class names in docs --- src/viewer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/viewer.js b/src/viewer.js index a2e36d6b..df8dce87 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -24,9 +24,9 @@ var THIS = {}, * @param {String} options.xmlPath Xpath ( TODO: not sure! ), * @param {String} options.prefixUrl Url used to prepend to paths, eg button * images, etc. - * @param {Seadragon.Controls[]} options.controls Array of Seadragon.Controls, - * @param {Seadragon.Overlays[]} options.overlays Array of Seadragon.Overlays, - * @param {Seadragon.Controls[]} options.overlayControls An Array of ( TODO: + * @param {OpenSeadragon.Control[]} options.controls Array of OpenSeadragon.Control, + * @param {OpenSeadragon.Overlay[]} options.overlays Array of OpenSeadragon.Overlay, + * @param {OpenSeadragon.Control[]} options.overlayControls An Array of ( TODO: * not sure! ) * @property {OpenSeadragon.Viewport} viewport The viewer's viewport, where you * can access zoom, pan, etc. From 8901ff8ea98059536bbcd083d9803fcd41f84be1 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Tue, 7 May 2013 09:27:37 -0700 Subject: [PATCH 27/71] Updated changelog --- README.md | 6 ++++++ changelog.txt | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/README.md b/README.md index 693c49a3..0fdad825 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,12 @@ OpenSeadragon is truly a community project; we welcome your involvement! When contributing, please attempt to match the code style already in the codebase. Note that we use four spaces per indentation stop. For more thoughts on code style, see https://github.com/rwldrn/idiomatic.js/. +When fixing bugs and adding features, when appropriate please also: + +* Update changelog.txt +* Add/update related unit tests +* Update related doc comments + If you're new to the project, check out our [good first bug](https://github.com/openseadragon/openseadragon/issues?labels=good+first+bug&page=1&state=open) issues for some places to dip your toe in the water. ## Licenses diff --git a/changelog.txt b/changelog.txt index 871d7f84..6e9007a0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -7,6 +7,10 @@ OPENSEADRAGON CHANGELOG Viewer.openDZI to use Viewer.open internally. (#53 & #54). * Full page bug fix for when viewer is child of document body (#43). * Overlays for DZI bug fix (#45). +* DziTileSource: avoid changing relative paths (#56). +* Fix typo in preserveViewport handling (#77). +* Fix updateMulti timer leak after multiple Viewer.open() calls (#76). +* Minor documentation fixes. 0.9.124: From b5ba57fb6da4e0237e0aa5d0881390cd31bc757c Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Tue, 7 May 2013 09:42:51 -0700 Subject: [PATCH 28/71] Trying to trigger IRC commit hook --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0fdad825..5dbd048a 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ When fixing bugs and adding features, when appropriate please also: * Update changelog.txt * Add/update related unit tests -* Update related doc comments +* Update related doc comments If you're new to the project, check out our [good first bug](https://github.com/openseadragon/openseadragon/issues?labels=good+first+bug&page=1&state=open) issues for some places to dip your toe in the water. From 65274c0159b83c8d74107c54c42409c4d60a2b51 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Tue, 7 May 2013 09:50:20 -0700 Subject: [PATCH 29/71] Trying again to trigger IRC hook --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5dbd048a..0fdad825 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ When fixing bugs and adding features, when appropriate please also: * Update changelog.txt * Add/update related unit tests -* Update related doc comments +* Update related doc comments If you're new to the project, check out our [good first bug](https://github.com/openseadragon/openseadragon/issues?labels=good+first+bug&page=1&state=open) issues for some places to dip your toe in the water. From 1ef566607fbd42e21da2514a1e258d0de1761dc4 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 9 May 2013 09:34:11 -0700 Subject: [PATCH 30/71] Updated version number to 0.9.125 --- changelog.txt | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 6e9007a0..d52f5878 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,7 @@ OPENSEADRAGON CHANGELOG ======================= -0.9.125: In Progress +0.9.125: * Fully deprecated OpenSeadragon.createFromDZI, safely deprecated Viewer.openTileSource and Viewer.openDZI to use Viewer.open internally. (#53 & #54). diff --git a/package.json b/package.json index fe3dff04..b0e36c66 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenSeadragon", - "version": "0.9.124", + "version": "0.9.125", "description": "Provides a smooth, zoomable user interface for HTML/Javascript.", "devDependencies": { "grunt": "~0.4.0", From f817d4d4ac3412e7ccda6ddcaf52851e88d75c28 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 9 May 2013 09:36:26 -0700 Subject: [PATCH 31/71] Added 0.9.126 to changelog --- changelog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog.txt b/changelog.txt index d52f5878..6e1e666b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,8 @@ OPENSEADRAGON CHANGELOG ======================= +0.9.126: (in progress) + 0.9.125: * Fully deprecated OpenSeadragon.createFromDZI, safely deprecated Viewer.openTileSource and From 8ded889af4d4d242914aa3c896698b5fbd22890a Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 9 May 2013 11:02:25 -0700 Subject: [PATCH 32/71] DZI JSONp was broken; fixed Also added support for DZI files with .xml extension --- src/dzitilesource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dzitilesource.js b/src/dzitilesource.js index 2a8150c4..6f148380 100644 --- a/src/dzitilesource.js +++ b/src/dzitilesource.js @@ -109,7 +109,7 @@ $.extend( $.DziTileSource.prototype, $.TileSource.prototype, { } if (url && !options.tilesUrl) { - options.tilesUrl = url.replace(/([^\/]+)\.dzi$/, '$1_files/'); + options.tilesUrl = url.replace(/([^\/]+)\.(dzi|xml|js)$/, '$1_files/'); } return options; From 4f1332860929fa15fd2af5de3fe64b897a25e30c Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 9 May 2013 11:02:51 -0700 Subject: [PATCH 33/71] Minor cleanups on basic test --- test/basic.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/basic.js b/test/basic.js index ca4556c8..ff302670 100644 --- a/test/basic.js +++ b/test/basic.js @@ -1,5 +1,7 @@ (function() { + module('Basic'); + // TODO: Tighten up springs and use "immediate" where possible, so tests run faster // TODO: Test drag @@ -104,6 +106,7 @@ asyncTest('Close', function() { var closeHandler = function() { viewer.removeHandler('close', closeHandler); + $('#example').empty(); ok(true, 'Close event was sent'); start(); }; From 05c25fddcf27e98815153a9e48539d89aabbe8c3 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 9 May 2013 11:03:31 -0700 Subject: [PATCH 34/71] Getting started on a DZI-JSONp test; currently disabled --- test/data/testpattern.js | 12 ++++++++++ test/dzi-jsonp.js | 51 ++++++++++++++++++++++++++++++++++++++++ test/test.html | 1 + 3 files changed, 64 insertions(+) create mode 100644 test/data/testpattern.js create mode 100644 test/dzi-jsonp.js diff --git a/test/data/testpattern.js b/test/data/testpattern.js new file mode 100644 index 00000000..8081b54b --- /dev/null +++ b/test/data/testpattern.js @@ -0,0 +1,12 @@ +testpattern({ + Image: { + xmlns: 'http://schemas.microsoft.com/deepzoom/2008', + Format: 'jpg', + Overlap: 1, + TileSize: 254, + Size:{ + Height: 1000, + Width: 1000 + } + } +}); diff --git a/test/dzi-jsonp.js b/test/dzi-jsonp.js new file mode 100644 index 00000000..138de35b --- /dev/null +++ b/test/dzi-jsonp.js @@ -0,0 +1,51 @@ +(function() { + + // TODO: How to know if a tile has been drawn? The tile-drawn event used below + // is defunct. + + module('DZI JSONp'); + + var viewer = null; + + // ---------- + asyncTest('Open', function() { + $(document).ready(function() { + viewer = OpenSeadragon({ + id: 'example', + prefixUrl: '/build/openseadragon/images/', + tileSources: '/test/data/testpattern.js' + }); + + ok(viewer, 'Viewer exists'); + + var openHandler = function(eventSender, eventData) { + viewer.removeHandler('open', openHandler); + ok(true, 'Open event was sent'); + viewer.drawer.viewer = viewer; + viewer.addHandler('tile-drawn', tileDrawnHandler); + }; + + var tileDrawnHandler = function(eventSender, eventData) { + viewer.removeHandler('tile-drawn', tileDrawnHandler); + ok(true, 'A tile has been drawn'); + start(); + }; + + viewer.addHandler('open', openHandler); + }); + }); + + // ---------- + // asyncTest('Close', function() { + // var closeHandler = function() { + // viewer.removeHandler('close', closeHandler); + // $('#example').empty(); + // ok(true, 'Close event was sent'); + // start(); + // }; + + // viewer.addHandler('close', closeHandler); + // viewer.close(); + // }); + +})(); diff --git a/test/test.html b/test/test.html index 37a9afe4..878547a8 100644 --- a/test/test.html +++ b/test/test.html @@ -16,5 +16,6 @@ + \ No newline at end of file From 8f20f3dae2e47b72e00f8187ba54646521a66c8b Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 9 May 2013 11:04:31 -0700 Subject: [PATCH 35/71] Upping version number to 0.9.126 --- changelog.txt | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 6e1e666b..320970c0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,9 @@ OPENSEADRAGON CHANGELOG ======================= -0.9.126: (in progress) +0.9.126: + +* DZI JSONp was broken; fixed. 0.9.125: diff --git a/package.json b/package.json index b0e36c66..f6a24dc5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenSeadragon", - "version": "0.9.125", + "version": "0.9.126", "description": "Provides a smooth, zoomable user interface for HTML/Javascript.", "devDependencies": { "grunt": "~0.4.0", From c7105695db432703e196bf29e134896f32407796 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Thu, 9 May 2013 11:07:17 -0700 Subject: [PATCH 36/71] Added in progress version --- changelog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog.txt b/changelog.txt index 320970c0..eed40e53 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,8 @@ OPENSEADRAGON CHANGELOG ======================= +0.9.127: (in progress) + 0.9.126: * DZI JSONp was broken; fixed. From 9d763c0984aab9bd8748fbe967b76a61ddaac680 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 May 2013 21:05:38 -0400 Subject: [PATCH 37/71] Update to latest grunt-contrib-compress --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f6a24dc5..4450061b 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Provides a smooth, zoomable user interface for HTML/Javascript.", "devDependencies": { "grunt": "~0.4.0", - "grunt-contrib-compress": "~0.4.0", + "grunt-contrib-compress": "~0.5.0", "grunt-contrib-concat": "~0.1.2", "grunt-contrib-jshint": "~0.1.1", "grunt-contrib-uglify": "~0.1.1", From be206458768069ba13bb7aa879179672266ad525 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 1 May 2013 00:46:16 -0400 Subject: [PATCH 38/71] Add BSD license block and CodePlex copyright to each source file See discussion in #10. --- src/button.js | 33 +++++++++++++++++++++++++++++++++ src/buttongroup.js | 33 +++++++++++++++++++++++++++++++++ src/control.js | 33 +++++++++++++++++++++++++++++++++ src/controldock.js | 35 ++++++++++++++++++++++++++++++++++- src/displayrectangle.js | 33 +++++++++++++++++++++++++++++++++ src/drawer.js | 33 +++++++++++++++++++++++++++++++++ src/dzitilesource.js | 32 ++++++++++++++++++++++++++++++++ src/eventhandler.js | 33 +++++++++++++++++++++++++++++++++ src/fullscreen.js | 36 +++++++++++++++++++++++++++++++++++- src/iiiftilesource.js | 35 ++++++++++++++++++++++++++++++++++- src/legacytilesource.js | 33 +++++++++++++++++++++++++++++++++ src/mousetracker.js | 33 +++++++++++++++++++++++++++++++++ src/navigator.js | 33 +++++++++++++++++++++++++++++++++ src/openseadragon.js | 33 +++++++++++++++++++++++++++++++++ src/osmtilesource.js | 33 +++++++++++++++++++++++++++++++++ src/overlay.js | 33 +++++++++++++++++++++++++++++++++ src/point.js | 33 +++++++++++++++++++++++++++++++++ src/profiler.js | 33 +++++++++++++++++++++++++++++++++ src/rectangle.js | 33 +++++++++++++++++++++++++++++++++ src/referencestrip.js | 34 +++++++++++++++++++++++++++++++++- src/spring.js | 33 +++++++++++++++++++++++++++++++++ src/strings.js | 32 ++++++++++++++++++++++++++++++++ src/tile.js | 33 +++++++++++++++++++++++++++++++++ src/tilesource.js | 33 +++++++++++++++++++++++++++++++++ src/tilesourcecollection.js | 33 +++++++++++++++++++++++++++++++++ src/tmstilesource.js | 35 ++++++++++++++++++++++++++++++++++- src/viewer.js | 33 +++++++++++++++++++++++++++++++++ src/viewport.js | 33 +++++++++++++++++++++++++++++++++ 28 files changed, 927 insertions(+), 5 deletions(-) diff --git a/src/button.js b/src/button.js index 4b98faf3..b61426b5 100644 --- a/src/button.js +++ b/src/button.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/buttongroup.js b/src/buttongroup.js index 2d77d11b..1a9d0425 100644 --- a/src/buttongroup.js +++ b/src/buttongroup.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** * Manages events on groups of buttons. diff --git a/src/control.js b/src/control.js index cdb10cd1..3c6b147e 100644 --- a/src/control.js +++ b/src/control.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/controldock.js b/src/controldock.js index 5360463b..aeab7614 100644 --- a/src/controldock.js +++ b/src/controldock.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ //id hash for private properties; @@ -181,4 +214,4 @@ return -1; } -}( OpenSeadragon )); \ No newline at end of file +}( OpenSeadragon )); diff --git a/src/displayrectangle.js b/src/displayrectangle.js index fe5604be..eaee8c73 100644 --- a/src/displayrectangle.js +++ b/src/displayrectangle.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/drawer.js b/src/drawer.js index 85bab42a..a5f406d9 100644 --- a/src/drawer.js +++ b/src/drawer.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ var DEVICE_SCREEN = $.getWindowSize(), diff --git a/src/dzitilesource.js b/src/dzitilesource.js index 6f148380..eef348b7 100644 --- a/src/dzitilesource.js +++ b/src/dzitilesource.js @@ -1,3 +1,35 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ (function( $ ){ diff --git a/src/eventhandler.js b/src/eventhandler.js index 2635e86a..edc88435 100644 --- a/src/eventhandler.js +++ b/src/eventhandler.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function($){ /** diff --git a/src/fullscreen.js b/src/fullscreen.js index 16c3a4d0..4f198a24 100644 --- a/src/fullscreen.js +++ b/src/fullscreen.js @@ -1,3 +1,37 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + /** * Determines the appropriate level of native full screen support we can get * from the browser. @@ -75,4 +109,4 @@ // export api $.extend( $, fullScreenApi ); -})( OpenSeadragon ); \ No newline at end of file +})( OpenSeadragon ); diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index 8cf3fc5b..a8391833 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** @@ -284,4 +317,4 @@ function configureFromObject( tileSource, configuration ){ return configuration; } -}( OpenSeadragon )); \ No newline at end of file +}( OpenSeadragon )); diff --git a/src/legacytilesource.js b/src/legacytilesource.js index 7ba4e952..92cd34a7 100644 --- a/src/legacytilesource.js +++ b/src/legacytilesource.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/mousetracker.js b/src/mousetracker.js index 397fd19f..0cab3bb5 100644 --- a/src/mousetracker.js +++ b/src/mousetracker.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ // is any button currently being pressed while mouse events occur diff --git a/src/navigator.js b/src/navigator.js index d63acef2..9effbf12 100644 --- a/src/navigator.js +++ b/src/navigator.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/openseadragon.js b/src/openseadragon.js index 186f48c1..3083fa29 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + /** * @version <%= pkg.name %> <%= pkg.version %> * diff --git a/src/osmtilesource.js b/src/osmtilesource.js index b8c43dea..a3967c84 100644 --- a/src/osmtilesource.js +++ b/src/osmtilesource.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/overlay.js b/src/overlay.js index c39884b7..4bf49f17 100644 --- a/src/overlay.js +++ b/src/overlay.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/point.js b/src/point.js index e1da1bcc..d9129441 100644 --- a/src/point.js +++ b/src/point.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/profiler.js b/src/profiler.js index dda7d15c..865b01ff 100644 --- a/src/profiler.js +++ b/src/profiler.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/rectangle.js b/src/rectangle.js index 6e255610..498e713c 100644 --- a/src/rectangle.js +++ b/src/rectangle.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/referencestrip.js b/src/referencestrip.js index 80bf10d1..d022ec29 100644 --- a/src/referencestrip.js +++ b/src/referencestrip.js @@ -1,3 +1,35 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ (function( $ ){ @@ -517,4 +549,4 @@ function onKeyPress( tracker, keyCode, shiftKey ){ -}( OpenSeadragon )); \ No newline at end of file +}( OpenSeadragon )); diff --git a/src/spring.js b/src/spring.js index cdf96fa4..7eac0f5b 100644 --- a/src/spring.js +++ b/src/spring.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/strings.js b/src/strings.js index 4d98c1e2..82a6a7c0 100644 --- a/src/strings.js +++ b/src/strings.js @@ -1,3 +1,35 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ (function( $ ){ diff --git a/src/tile.js b/src/tile.js index d6ba9f87..6f86ae6f 100644 --- a/src/tile.js +++ b/src/tile.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ var TILE_CACHE = {}; /** diff --git a/src/tilesource.js b/src/tilesource.js index 650a9477..5e215769 100644 --- a/src/tilesource.js +++ b/src/tilesource.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ diff --git a/src/tilesourcecollection.js b/src/tilesourcecollection.js index a64d6d0c..f58e36d5 100644 --- a/src/tilesourcecollection.js +++ b/src/tilesourcecollection.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** diff --git a/src/tmstilesource.js b/src/tmstilesource.js index 1ab550fc..308ccdad 100644 --- a/src/tmstilesource.js +++ b/src/tmstilesource.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ /** @@ -95,4 +128,4 @@ $.extend( $.TmsTileSource.prototype, $.TileSource.prototype, { }); -}( OpenSeadragon )); \ No newline at end of file +}( OpenSeadragon )); diff --git a/src/viewer.js b/src/viewer.js index df8dce87..5acffc36 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ // dictionary from hash to private properties diff --git a/src/viewport.js b/src/viewport.js index d5800cf1..c861a21e 100644 --- a/src/viewport.js +++ b/src/viewport.js @@ -1,3 +1,36 @@ +/* + * OpenSeadragon + * + * Copyright (C) 2009 CodePlex Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of CodePlex Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + (function( $ ){ From a7c96c56efde6713db2aa71b60c83d983a20b14c Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 1 May 2013 01:06:42 -0400 Subject: [PATCH 39/71] Drop MIT license; move BSD license to root directory All OpenSeadragon contributors have granted their permission for this relicensing in #58. Drop copyright statements for Ian Gilman and Christopher Thatcher as they requested in #10. Revert CodePlex Foundation copyright date to 2009 pursuant to discussion in #10. --- Gruntfile.js | 3 +- licenses/new-bsd.txt => LICENSE.txt | 11 --- README.md | 46 +----------- licenses/mit.txt | 21 ------ src/openseadragon.js | 105 +++++----------------------- 5 files changed, 19 insertions(+), 167 deletions(-) rename licenses/new-bsd.txt => LICENSE.txt (83%) delete mode 100644 licenses/mit.txt diff --git a/Gruntfile.js b/Gruntfile.js index 40af664e..fb9471b0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -167,8 +167,7 @@ module.exports = function(grunt) { grunt.file.copy(abspath, dest); }); grunt.file.copy("changelog.txt", packageDir + "changelog.txt"); - grunt.file.copy("licenses/mit.txt", packageDir + "licenses/mit.txt"); - grunt.file.copy("licenses/new-bsd.txt", packageDir + "licenses/new-bsd.txt"); + grunt.file.copy("LICENSE.txt", packageDir + "LICENSE.txt"); }); // ---------- diff --git a/licenses/new-bsd.txt b/LICENSE.txt similarity index 83% rename from licenses/new-bsd.txt rename to LICENSE.txt index 0d24a9f9..81672085 100644 --- a/licenses/new-bsd.txt +++ b/LICENSE.txt @@ -1,12 +1,3 @@ -This license is preserved from the OpenSeadragon project at -http://openseadragon.codeplex.com/ as per the text below. - -------------------------------------- - -License: New BSD License (BSD) -Copyright (c) 2010, OpenSeadragon -All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -32,5 +23,3 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -------------------------------------- diff --git a/README.md b/README.md index 0fdad825..aff68612 100644 --- a/README.md +++ b/README.md @@ -70,50 +70,8 @@ When fixing bugs and adding features, when appropriate please also: If you're new to the project, check out our [good first bug](https://github.com/openseadragon/openseadragon/issues?labels=good+first+bug&page=1&state=open) issues for some places to dip your toe in the water. -## Licenses +## License -OpenSeadragon was initially released with a New BSD License ( preserved below ), while work done by Chris Thatcher is additionally licensed under the MIT License. - -### Original license preserved below - -------------------------------------- -License: New BSD License (BSD) -Copyright (c) 2010, OpenSeadragon -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -* Neither the name of OpenSeadragon nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -### MIT License - --------------------------------------- -(c) Christopher Thatcher 2011, 2012. All rights reserved. - -Licensed with the MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +OpenSeadragon is released under the New BSD license. For details, see the file LICENSE.txt. [![Build Status](https://secure.travis-ci.org/openseadragon/openseadragon.png?branch=master)](http://travis-ci.org/openseadragon/openseadragon) diff --git a/licenses/mit.txt b/licenses/mit.txt deleted file mode 100644 index 24ad8aa6..00000000 --- a/licenses/mit.txt +++ /dev/null @@ -1,21 +0,0 @@ -(c) Christopher Thatcher 2011, 2012. All rights reserved. - -Licensed with the MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/src/openseadragon.js b/src/openseadragon.js index 3083fa29..fefd4383 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -31,95 +31,22 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** - * @version <%= pkg.name %> <%= pkg.version %> - * - * @fileOverview - *

- * - * OpenSeadragon - Javascript Deep Zooming - * - *

- *

- * OpenSeadragon is provides an html interface for creating - * deep zoom user interfaces. The simplest examples include deep - * zoom for large resolution images, and complex examples include - * zoomable map interfaces driven by SVG files. - *

- * - * @author
(c) 2011, 2012 Christopher Thatcher - * @author
(c) 2010 OpenSeadragon Team - * @author
(c) 2010 CodePlex Foundation - * - *

- * Original license preserved below:
- *

- * ----------------------------------------------------------------------------
- * 
- *  License: New BSD License (BSD)
- *  Copyright (c) 2010, OpenSeadragon
- *  All rights reserved.
- * 
- *  Redistribution and use in source and binary forms, with or without 
- *  modification, are permitted provided that the following conditions are met:
- *  
- *  * Redistributions of source code must retain the above copyright notice, this 
- *    list of conditions and the following disclaimer.
- *  
- *  * Redistributions in binary form must reproduce the above copyright notice, 
- *    this list of conditions and the following disclaimer in the documentation 
- *    and/or other materials provided with the distribution.
- * 
- *  * Neither the name of OpenSeadragon nor the names of its contributors may be 
- *    used to endorse or promote products derived from this software without 
- *    specific prior written permission.
- * 
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
- *  POSSIBILITY OF SUCH DAMAGE.
- * 
- * ---------------------------------------------------------------------------
- * 
- *

- *

- * Work done by Chris Thatcher adds an MIT license
- *

- * ----------------------------------------------------------------------------
- * (c) Christopher Thatcher 2011, 2012. All rights reserved.
- * 
- * Licensed with the MIT License
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * ---------------------------------------------------------------------------
- * 
- *

- **/ - - /** + /** + * @version <%= pkg.name %> <%= pkg.version %> + * + * @fileOverview + *

+ * + * OpenSeadragon - Javascript Deep Zooming + * + *

+ *

+ * OpenSeadragon is provides an html interface for creating + * deep zoom user interfaces. The simplest examples include deep + * zoom for large resolution images, and complex examples include + * zoomable map interfaces driven by SVG files. + *

+ * * The root namespace for OpenSeadragon, this function also serves as a single * point of instantiation for an {@link OpenSeadragon.Viewer}, including all * combinations of out-of-the-box configurable features. All utility methods From f72aaeb90397717e8f5bb1d62329f5b139731648 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 1 May 2013 01:07:16 -0400 Subject: [PATCH 40/71] Clean up LICENSE.txt formatting --- LICENSE.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 81672085..01dea7f5 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,25 +1,25 @@ -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -* Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. +- Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. +- Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. -* Neither the name of OpenSeadragon nor the names of its contributors may be -used to endorse or promote products derived from this software without -specific prior written permission. +- Neither the name of OpenSeadragon nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 52badbef36f3343e2cf9573face7f5a2b7cf952c Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 10 May 2013 00:57:49 -0400 Subject: [PATCH 41/71] Add MIT license blocks to src/openseadragon.js for code taken from jQuery and from mattsnider.com. Ideally we'd keep the MIT-licensed helper code in a separate file, but it proved difficult to extricate from the rest of openseadragon.js. Also remove comment about plagiarism. It's not plagiarism if it's attributed and properly licensed. --- src/openseadragon.js | 57 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/src/openseadragon.js b/src/openseadragon.js index fefd4383..f43b4e39 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -31,6 +31,57 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Portions of this source file taken from jQuery: + * + * Copyright 2011 John Resig + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/* + * Portions of this source file taken from mattsnider.com: + * + * Copyright (c) 2006-2013 Matt Snider + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT + * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + + /** * @version <%= pkg.name %> <%= pkg.version %> * @@ -331,9 +382,9 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ * namespace. Many, if not most, are taked directly from jQuery for use * to simplify and reduce common programming patterns. More static methods * from jQuery may eventually make their way into this though we are - * attempting to avoid substaintial plagarism or the more explicit dependency - * on jQuery only because OpenSeadragon is a broadly useful code base and - * would be made less broad by requiring jQuery fully. + * attempting to avoid an explicit dependency on jQuery only because + * OpenSeadragon is a broadly useful code base and would be made less broad + * by requiring jQuery fully. * * Some static methods have also been refactored from the original OpenSeadragon * project. From c6f8b5e192daeceef7794f79af52e9e9388e3684 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Fri, 10 May 2013 11:32:22 -0700 Subject: [PATCH 42/71] Fixed broken viewer.raiseEvent calls in drawer.js --- src/drawer.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/drawer.js b/src/drawer.js index 85bab42a..e9696012 100644 --- a/src/drawer.js +++ b/src/drawer.js @@ -228,8 +228,7 @@ $.Drawer.prototype = { } if( this.viewer ){ this.viewer.raiseEvent( 'clear-overlay', { - viewer: this.viewer, - element: element + viewer: this.viewer }); } return this; @@ -583,8 +582,8 @@ function updateLevel( drawer, haveDrawn, level, levelOpacity, levelVisibility, v level: level, opacity: levelOpacity, visibility: levelVisibility, - topleft: viewportTopLeft, - bottomright: viewportBottomRight, + topleft: viewportTL, + bottomright: viewportBR, currenttime: currentTime, best: best }); From 457f908c064b521f0d27bd5855039a2dca0bef1b Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Fri, 10 May 2013 11:32:43 -0700 Subject: [PATCH 43/71] DZI-JSONp test now works; enabled --- test/dzi-jsonp.js | 31 ++++++++++++++++++------------- test/test.html | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/test/dzi-jsonp.js b/test/dzi-jsonp.js index 138de35b..dca069d5 100644 --- a/test/dzi-jsonp.js +++ b/test/dzi-jsonp.js @@ -1,8 +1,5 @@ (function() { - // TODO: How to know if a tile has been drawn? The tile-drawn event used below - // is defunct. - module('DZI JSONp'); var viewer = null; @@ -22,12 +19,20 @@ viewer.removeHandler('open', openHandler); ok(true, 'Open event was sent'); viewer.drawer.viewer = viewer; + + timeout = setTimeout(function() { + viewer.removeHandler('tile-drawn', tileDrawnHandler); + ok(false, 'taking too long'); + start(); + }, 2000); + viewer.addHandler('tile-drawn', tileDrawnHandler); }; var tileDrawnHandler = function(eventSender, eventData) { viewer.removeHandler('tile-drawn', tileDrawnHandler); ok(true, 'A tile has been drawn'); + clearTimeout(timeout); start(); }; @@ -36,16 +41,16 @@ }); // ---------- - // asyncTest('Close', function() { - // var closeHandler = function() { - // viewer.removeHandler('close', closeHandler); - // $('#example').empty(); - // ok(true, 'Close event was sent'); - // start(); - // }; + asyncTest('Close', function() { + var closeHandler = function() { + viewer.removeHandler('close', closeHandler); + $('#example').empty(); + ok(true, 'Close event was sent'); + start(); + }; - // viewer.addHandler('close', closeHandler); - // viewer.close(); - // }); + viewer.addHandler('close', closeHandler); + viewer.close(); + }); })(); diff --git a/test/test.html b/test/test.html index 878547a8..ad80ea07 100644 --- a/test/test.html +++ b/test/test.html @@ -16,6 +16,6 @@ - + \ No newline at end of file From b95d6540a14eb08a387cbb2e61d230b32c4306b7 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Fri, 10 May 2013 11:53:49 -0700 Subject: [PATCH 44/71] Generalized test timeout code --- test/dzi-jsonp.js | 12 +++--------- test/util.js | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/test/dzi-jsonp.js b/test/dzi-jsonp.js index dca069d5..08b7da22 100644 --- a/test/dzi-jsonp.js +++ b/test/dzi-jsonp.js @@ -7,6 +7,8 @@ // ---------- asyncTest('Open', function() { $(document).ready(function() { + var timeWatcher = Util.timeWatcher(); + viewer = OpenSeadragon({ id: 'example', prefixUrl: '/build/openseadragon/images/', @@ -19,21 +21,13 @@ viewer.removeHandler('open', openHandler); ok(true, 'Open event was sent'); viewer.drawer.viewer = viewer; - - timeout = setTimeout(function() { - viewer.removeHandler('tile-drawn', tileDrawnHandler); - ok(false, 'taking too long'); - start(); - }, 2000); - viewer.addHandler('tile-drawn', tileDrawnHandler); }; var tileDrawnHandler = function(eventSender, eventData) { viewer.removeHandler('tile-drawn', tileDrawnHandler); ok(true, 'A tile has been drawn'); - clearTimeout(timeout); - start(); + timeWatcher.done(); }; viewer.addHandler('open', openHandler); diff --git a/test/util.js b/test/util.js index a426bd52..382e7032 100644 --- a/test/util.js +++ b/test/util.js @@ -26,6 +26,29 @@ .simulate('mouseover', event) .simulate('mousedown', event) .simulate('mouseup', event); + }, + + // ---------- + timeWatcher: function(time) { + time = time || 2000; + var finished = false; + + setTimeout(function() { + if (!finished) { + finished = true; + ok(false, 'finishes in ' + time + 'ms'); + start(); + } + }, time); + + return { + done: function() { + if (!finished) { + finished = true; + start(); + } + } + }; } }; From 69709a9666b9583df638f06a98a6b6f92bdaca1d Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Fri, 10 May 2013 12:04:09 -0700 Subject: [PATCH 45/71] Updated changelog --- changelog.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.txt b/changelog.txt index eed40e53..6abe402c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,9 @@ OPENSEADRAGON CHANGELOG 0.9.127: (in progress) +* Fixed a problem with getString when the string property is a sub-property. (#64) +* Cleaned up some diagnostic code that was broken. + 0.9.126: * DZI JSONp was broken; fixed. From ad9b66f3fb7a9b0c81b5708f4df80872d63e4d91 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 12 May 2013 16:46:24 -0400 Subject: [PATCH 46/71] Add copyright statement to LICENSE.txt The license speaks of "the above copyright notice", so it would behoove us to have one. --- LICENSE.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LICENSE.txt b/LICENSE.txt index 01dea7f5..e8b6ffa5 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,3 +1,5 @@ +Copyright (C) 2009 CodePlex Foundation + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From 2f2eba8df2cc50868a1d99a638b399dc1f194c9f Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 12 May 2013 17:12:26 -0400 Subject: [PATCH 47/71] Add "OpenSeadragon contributors" copyright statement The license text will be provided on the website, etc., and it seems strange to list no copyright date newer than the original CodePlex copyright from the AJAX Control Toolkit. Add a blanket copyright statement for contributions to the OpenSeadragon project, stating that copyright is held by the authors of each contribution. This blanket statement is not intended to preclude individual contributors from attaching their own copyright statements to their modifications. --- LICENSE.txt | 1 + src/button.js | 1 + src/buttongroup.js | 1 + src/control.js | 1 + src/controldock.js | 1 + src/displayrectangle.js | 1 + src/drawer.js | 1 + src/dzitilesource.js | 1 + src/eventhandler.js | 1 + src/fullscreen.js | 1 + src/iiiftilesource.js | 1 + src/legacytilesource.js | 1 + src/mousetracker.js | 1 + src/navigator.js | 1 + src/openseadragon.js | 1 + src/osmtilesource.js | 1 + src/overlay.js | 1 + src/point.js | 1 + src/profiler.js | 1 + src/rectangle.js | 1 + src/referencestrip.js | 1 + src/spring.js | 1 + src/strings.js | 1 + src/tile.js | 1 + src/tilesource.js | 1 + src/tilesourcecollection.js | 1 + src/tmstilesource.js | 1 + src/viewer.js | 1 + src/viewport.js | 1 + 29 files changed, 29 insertions(+) diff --git a/LICENSE.txt b/LICENSE.txt index e8b6ffa5..e2316f3a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,5 @@ Copyright (C) 2009 CodePlex Foundation +Copyright (C) 2011-2013 OpenSeadragon contributors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/src/button.js b/src/button.js index b61426b5..88b73df2 100644 --- a/src/button.js +++ b/src/button.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/buttongroup.js b/src/buttongroup.js index 1a9d0425..d0554d98 100644 --- a/src/buttongroup.js +++ b/src/buttongroup.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/control.js b/src/control.js index 3c6b147e..69507f5c 100644 --- a/src/control.js +++ b/src/control.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/controldock.js b/src/controldock.js index aeab7614..41e2d43a 100644 --- a/src/controldock.js +++ b/src/controldock.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/displayrectangle.js b/src/displayrectangle.js index eaee8c73..0e9623df 100644 --- a/src/displayrectangle.js +++ b/src/displayrectangle.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/drawer.js b/src/drawer.js index a5f406d9..c5520558 100644 --- a/src/drawer.js +++ b/src/drawer.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/dzitilesource.js b/src/dzitilesource.js index eef348b7..1b2b2515 100644 --- a/src/dzitilesource.js +++ b/src/dzitilesource.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/eventhandler.js b/src/eventhandler.js index edc88435..dcbf60de 100644 --- a/src/eventhandler.js +++ b/src/eventhandler.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/fullscreen.js b/src/fullscreen.js index 4f198a24..99a5ec1f 100644 --- a/src/fullscreen.js +++ b/src/fullscreen.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index a8391833..adf9dab7 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/legacytilesource.js b/src/legacytilesource.js index 92cd34a7..a6533cff 100644 --- a/src/legacytilesource.js +++ b/src/legacytilesource.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/mousetracker.js b/src/mousetracker.js index 0cab3bb5..d8416ad8 100644 --- a/src/mousetracker.js +++ b/src/mousetracker.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/navigator.js b/src/navigator.js index 9effbf12..bbeab98a 100644 --- a/src/navigator.js +++ b/src/navigator.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/openseadragon.js b/src/openseadragon.js index f43b4e39..cc5b567d 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/osmtilesource.js b/src/osmtilesource.js index a3967c84..3ace9b6c 100644 --- a/src/osmtilesource.js +++ b/src/osmtilesource.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/overlay.js b/src/overlay.js index 4bf49f17..49c862a3 100644 --- a/src/overlay.js +++ b/src/overlay.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/point.js b/src/point.js index d9129441..2f77bed8 100644 --- a/src/point.js +++ b/src/point.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/profiler.js b/src/profiler.js index 865b01ff..ae993840 100644 --- a/src/profiler.js +++ b/src/profiler.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/rectangle.js b/src/rectangle.js index 498e713c..cfb249fb 100644 --- a/src/rectangle.js +++ b/src/rectangle.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/referencestrip.js b/src/referencestrip.js index d022ec29..8e471922 100644 --- a/src/referencestrip.js +++ b/src/referencestrip.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/spring.js b/src/spring.js index 7eac0f5b..328f2804 100644 --- a/src/spring.js +++ b/src/spring.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/strings.js b/src/strings.js index 82a6a7c0..c5168ac4 100644 --- a/src/strings.js +++ b/src/strings.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/tile.js b/src/tile.js index 6f86ae6f..32586377 100644 --- a/src/tile.js +++ b/src/tile.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/tilesource.js b/src/tilesource.js index 5e215769..1a2efe53 100644 --- a/src/tilesource.js +++ b/src/tilesource.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/tilesourcecollection.js b/src/tilesourcecollection.js index f58e36d5..1cd62e9a 100644 --- a/src/tilesourcecollection.js +++ b/src/tilesourcecollection.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/tmstilesource.js b/src/tmstilesource.js index 308ccdad..4d98d23a 100644 --- a/src/tmstilesource.js +++ b/src/tmstilesource.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/viewer.js b/src/viewer.js index 5acffc36..975790a3 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/viewport.js b/src/viewport.js index c861a21e..5f5799d2 100644 --- a/src/viewport.js +++ b/src/viewport.js @@ -2,6 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation + * Copyright (C) 2011-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are From bbffa7a1824c886815f704f2b81e561d03788853 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 12 May 2013 17:17:35 -0400 Subject: [PATCH 48/71] Fix inherited error in clause 3 of LICENSE file The original AJAX Control Toolkit license prohibited the name of the CodePlex Foundation from being used to endorse/promote derived products. We need to preserve this requirement. This was already done in the .js header blocks, and should have been done in LICENSE.txt in a7c96c56 but was missed. Original discussion in #10. Permission for the license change was given by all existing contributors in #58. --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index e2316f3a..6b29093f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -11,9 +11,9 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -- Neither the name of OpenSeadragon nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. +- Neither the name of CodePlex Foundation nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE From c49de73692a44695c1d87fdcb85796f8779f4bb9 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 12 May 2013 17:21:32 -0400 Subject: [PATCH 49/71] Add license link to header of minified JS --- Gruntfile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Gruntfile.js b/Gruntfile.js index fb9471b0..ee063729 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -68,6 +68,7 @@ module.exports = function(grunt) { banner: "//! <%= pkg.name %> <%= pkg.version %>\n" + "//! Built on <%= grunt.template.today('yyyy-mm-dd') %>\n" + "//! Git commit: <%= gitInfo %>\n" + + "//! License: http://openseadragon.github.io/license/\n" + "//! http://openseadragon.github.io\n\n", process: true }, From d80d928d80b9f605a93b75afb3a9d0e0ca926bcb Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 12 May 2013 18:07:20 -0400 Subject: [PATCH 50/71] Document New BSD license on seajax-utils OSM/TMS code @rsimon has given permission in #58 for the OSM/TMS code that originated in seajax-utils to be released under the New BSD license. --- src/osmtilesource.js | 11 +++++++++-- src/tmstilesource.js | 15 +++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/osmtilesource.js b/src/osmtilesource.js index 3ace9b6c..ca70d857 100644 --- a/src/osmtilesource.js +++ b/src/osmtilesource.js @@ -32,11 +32,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Derived from the OSM tile source in Rainer Simon's seajax-utils project + * . Rainer Simon has contributed + * the included code to the OpenSeadragon project under the New BSD license; + * see #58. + */ + + (function( $ ){ /** - * A tilesource implementation for OpenStreetMap. Adopted from Rainer Simon - * project http://github.com/rsimon/seajax-utils. + * A tilesource implementation for OpenStreetMap. * * Note 1. Zoomlevels. Deep Zoom and OSM define zoom levels differently. In Deep * Zoom, level 0 equals an image of 1x1 pixels. In OSM, level 0 equals an image of diff --git a/src/tmstilesource.js b/src/tmstilesource.js index 4d98d23a..d945c790 100644 --- a/src/tmstilesource.js +++ b/src/tmstilesource.js @@ -32,13 +32,20 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Derived from the TMS tile source in Rainer Simon's seajax-utils project + * . Rainer Simon has contributed + * the included code to the OpenSeadragon project under the New BSD license; + * see #58. + */ + + (function( $ ){ /** - * A tilesource implementation for Tiled Map Services (TMS). Adopted from Rainer Simon - * project http://github.com/rsimon/seajax-utils. TMS tile - * scheme ( [ as supported by OpenLayers ] is described here - * ( http://openlayers.org/dev/examples/tms.html ) ) + * A tilesource implementation for Tiled Map Services (TMS). + * TMS tile scheme ( [ as supported by OpenLayers ] is described here + * ( http://openlayers.org/dev/examples/tms.html ). * * @class * @extends OpenSeadragon.TileSource From 56f5000d90312948a82d617010bce9907be5b86a Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 12 May 2013 21:33:55 -0400 Subject: [PATCH 51/71] Document MIT license on John Dyer's fullscreen code See #81. --- src/fullscreen.js | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/fullscreen.js b/src/fullscreen.js index 99a5ec1f..c8715457 100644 --- a/src/fullscreen.js +++ b/src/fullscreen.js @@ -32,14 +32,36 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Implementation and research by John Dyer in: + * http://johndyer.name/native-fullscreen-javascript-api-plus-jquery-plugin/ + * John Dyer has released this fullscreen code under the MIT license; see #81. + * + * Copyright (C) 2011 John Dyer + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT + * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + /** * Determines the appropriate level of native full screen support we can get * from the browser. - * Thanks to John Dyer for the implementation and research - * http://johndyer.name/native-fullscreen-javascript-api-plus-jquery-plugin/ - * Also includes older IE support based on - * http://stackoverflow.com/questions/1125084/how-to-make-in-javascript-full-screen-windows-stretching-all-over-the-screen/7525760 * @name $.supportsFullScreen */ (function( $ ) { @@ -95,7 +117,8 @@ document[this.prefix + 'CancelFullScreen'](); }; } else if ( typeof window.ActiveXObject !== "undefined" ){ - // Older IE. + // Older IE. Support based on: + // http://stackoverflow.com/questions/1125084/how-to-make-in-javascript-full-screen-windows-stretching-all-over-the-screen/7525760 fullScreenApi.requestFullScreen = function(){ var wscript = new ActiveXObject("WScript.Shell"); if ( wscript !== null ) { From 4e5393efe719b6681d471832416bfcedd1df6596 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 12 May 2013 21:51:47 -0400 Subject: [PATCH 52/71] Drop executable bit from images --- images/fullpage_grouphover.png | Bin images/fullpage_hover.png | Bin images/fullpage_pressed.png | Bin images/fullpage_rest.png | Bin images/home_grouphover.png | Bin images/home_hover.png | Bin images/home_pressed.png | Bin images/home_rest.png | Bin images/zoomin_grouphover.png | Bin images/zoomin_hover.png | Bin images/zoomin_pressed.png | Bin images/zoomin_rest.png | Bin images/zoomout_grouphover.png | Bin images/zoomout_hover.png | Bin images/zoomout_pressed.png | Bin images/zoomout_rest.png | Bin 16 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 images/fullpage_grouphover.png mode change 100755 => 100644 images/fullpage_hover.png mode change 100755 => 100644 images/fullpage_pressed.png mode change 100755 => 100644 images/fullpage_rest.png mode change 100755 => 100644 images/home_grouphover.png mode change 100755 => 100644 images/home_hover.png mode change 100755 => 100644 images/home_pressed.png mode change 100755 => 100644 images/home_rest.png mode change 100755 => 100644 images/zoomin_grouphover.png mode change 100755 => 100644 images/zoomin_hover.png mode change 100755 => 100644 images/zoomin_pressed.png mode change 100755 => 100644 images/zoomin_rest.png mode change 100755 => 100644 images/zoomout_grouphover.png mode change 100755 => 100644 images/zoomout_hover.png mode change 100755 => 100644 images/zoomout_pressed.png mode change 100755 => 100644 images/zoomout_rest.png diff --git a/images/fullpage_grouphover.png b/images/fullpage_grouphover.png old mode 100755 new mode 100644 diff --git a/images/fullpage_hover.png b/images/fullpage_hover.png old mode 100755 new mode 100644 diff --git a/images/fullpage_pressed.png b/images/fullpage_pressed.png old mode 100755 new mode 100644 diff --git a/images/fullpage_rest.png b/images/fullpage_rest.png old mode 100755 new mode 100644 diff --git a/images/home_grouphover.png b/images/home_grouphover.png old mode 100755 new mode 100644 diff --git a/images/home_hover.png b/images/home_hover.png old mode 100755 new mode 100644 diff --git a/images/home_pressed.png b/images/home_pressed.png old mode 100755 new mode 100644 diff --git a/images/home_rest.png b/images/home_rest.png old mode 100755 new mode 100644 diff --git a/images/zoomin_grouphover.png b/images/zoomin_grouphover.png old mode 100755 new mode 100644 diff --git a/images/zoomin_hover.png b/images/zoomin_hover.png old mode 100755 new mode 100644 diff --git a/images/zoomin_pressed.png b/images/zoomin_pressed.png old mode 100755 new mode 100644 diff --git a/images/zoomin_rest.png b/images/zoomin_rest.png old mode 100755 new mode 100644 diff --git a/images/zoomout_grouphover.png b/images/zoomout_grouphover.png old mode 100755 new mode 100644 diff --git a/images/zoomout_hover.png b/images/zoomout_hover.png old mode 100755 new mode 100644 diff --git a/images/zoomout_pressed.png b/images/zoomout_pressed.png old mode 100755 new mode 100644 diff --git a/images/zoomout_rest.png b/images/zoomout_rest.png old mode 100755 new mode 100644 From 522bcbf058f53c26ada4a294e8b6f55514a4ebf5 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 12 May 2013 22:53:41 -0400 Subject: [PATCH 53/71] Add addClass()/removeClass() utility functions --- src/drawer.js | 2 +- src/openseadragon.js | 42 ++++++++++++++++++++++++++++++++++++++++++ src/viewer.js | 10 ++-------- 3 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/drawer.js b/src/drawer.js index e9696012..40377aae 100644 --- a/src/drawer.js +++ b/src/drawer.js @@ -377,7 +377,7 @@ $.Drawer.prototype = { element.href = "#/overlay/"+id; } element.id = id; - element.className = element.className + " " + ( overlay.className ? + $.addClass( element, overlay.className ? overlay.className : "openseadragon-overlay" ); diff --git a/src/openseadragon.js b/src/openseadragon.js index 186f48c1..3095799e 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -1025,6 +1025,48 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ }, + /** + * Add the specified CSS class to the element if not present. + * @name $.addClass + * @function + * @param {Element|String} element + * @param {String} className + */ + addClass: function( element, className ) { + element = $.getElement( element ); + + if ( ! element.className ) { + element.className = className; + } else if ( ( ' ' + element.className + ' ' ). + indexOf( ' ' + className + ' ' ) === -1 ) { + element.className += ' ' + className; + } + }, + + + /** + * Remove the specified CSS class from the element. + * @name $.removeClass + * @function + * @param {Element|String} element + * @param {String} className + */ + removeClass: function( element, className ) { + var oldClasses, + newClasses = [], + i; + + element = $.getElement( element ); + oldClasses = element.className.split( /\s+/ ); + for ( i = 0; i < oldClasses.length; i++ ) { + if ( oldClasses[ i ] && oldClasses[ i ] !== className ) { + newClasses.push( oldClasses[ i ] ); + } + } + element.className = newClasses.join(' '); + }, + + /** * Adds an event listener for the given element, eventName and handler. * @function diff --git a/src/viewer.js b/src/viewer.js index df8dce87..5b688bc3 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -515,10 +515,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, //Make sure the user has some ability to style the toolbar based //on the mode - this.toolbar.element.setAttribute( - 'class', - this.toolbar.element.className +" fullpage" - ); + $.addClass( this.toolbar.element, 'fullpage' ); } body.appendChild( this.element ); @@ -602,10 +599,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, //Make sure the user has some ability to style the toolbar based //on the mode - this.toolbar.element.setAttribute( - 'class', - this.toolbar.element.className.replace('fullpage','') - ); + $.removeClass( this.toolbar.element, 'fullpage' ); //this.toolbar.element.style.position = 'relative'; this.toolbar.parentNode.insertBefore( this.toolbar.element, From 99d6ff80b6f9408a1db454693611a9b07e57af05 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 12 May 2013 23:02:18 -0400 Subject: [PATCH 54/71] Add fullpage class to viewer element when in fullpage mode Closes #61. --- src/viewer.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/viewer.js b/src/viewer.js index 5b688bc3..a0bcf907 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -518,6 +518,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, $.addClass( this.toolbar.element, 'fullpage' ); } + $.addClass( this.element, 'fullpage' ); body.appendChild( this.element ); if( $.supportsFullScreen ){ @@ -587,6 +588,8 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, for ( i = 0; i < nodes; i++ ){ body.appendChild( this.previousBody.shift() ); } + + $.removeClass( this.element, 'fullpage' ); THIS[ this.hash ].prevElementParent.insertBefore( this.element, THIS[ this.hash ].prevNextSibling From b3e8d98ec6a2013fbff2457689e517ffa65a909d Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Mon, 13 May 2013 10:20:57 -0700 Subject: [PATCH 55/71] Updated changelog for #63 --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index 6abe402c..b2733f65 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,6 +4,7 @@ OPENSEADRAGON CHANGELOG 0.9.127: (in progress) * Fixed a problem with getString when the string property is a sub-property. (#64) +* Fixed: Tooltips for Navigation Controls not displaying (#63) * Cleaned up some diagnostic code that was broken. 0.9.126: From 4182b5e5ba9d42a14772e20e8ae638e2fae90db6 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Mon, 13 May 2013 10:31:42 -0700 Subject: [PATCH 56/71] Made the distinction between using and developing on OpenSeadragon clearer --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0fdad825..6b55d9ab 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,19 @@ An open-source, web-based viewer for zoomable images, implemented in pure JavaScript. -See it in action at http://openseadragon.github.io/. +See it in action and get started using it at http://openseadragon.github.io/. ## Stable Builds See our [releases page](http://openseadragon.github.io/releases/). -## First Time Setup +## Development -All command-line operations are scripted using [Grunt](http://gruntjs.com/) which is based on [Node.js](http://nodejs.org/). To get set up: +If you want to use OpenSeadragon in your own projects, you can find the latest stable build, API documentation, and example code at http://openseadragon.github.io/. If you want to modify OpenSeadragon and/or contribute to its development, read on. + +### First Time Setup + +All command-line operations for building and testing OpenSeadragon are scripted using [Grunt](http://gruntjs.com/) which is based on [Node.js](http://nodejs.org/). To get set up: 1. Install Node, if you haven't already (available at the link above) 1. Install the Grunt command line runner (if you haven't already); on the command line, run `npm install -g grunt-cli` @@ -20,7 +24,7 @@ All command-line operations are scripted using [Grunt](http://gruntjs.com/) whic You're set... continue reading for build and test instructions. -## Building from Source +### Building from Source To build, just run (on the command line, in the openseadragon folder): @@ -44,7 +48,7 @@ You can also publish the built version to the site-build repository. This assume ... which will delete the existing openseadragon folder, along with the .zip and .tar.gz files, out of the site-build folder and replace them with newly built ones from the source in this repository; you'll then need to commit the changes to site-build. -## Testing +### Testing Our tests are based on [QUnit](http://qunitjs.com/) and [PhantomJS](http://phantomjs.org/); they're both installed when you run `npm install`. At the moment we don't have much in the way of tests, but we're working to fix that. To run on the command line: @@ -56,7 +60,7 @@ If you wish to work interactively with the tests or test your changes: and open `http://localhost:8000/` in your browser -## Contributing +### Contributing OpenSeadragon is truly a community project; we welcome your involvement! From 9001fe9a5e86c77d002432059d0c4bc0da88a473 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Mon, 13 May 2013 10:50:43 -0700 Subject: [PATCH 57/71] Generalized format test and added DZI XML --- test/data/testpattern.xml | 1 + test/{dzi-jsonp.js => formats.js} | 41 ++++++++++++++++++++----------- test/test.html | 2 +- 3 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 test/data/testpattern.xml rename test/{dzi-jsonp.js => formats.js} (54%) diff --git a/test/data/testpattern.xml b/test/data/testpattern.xml new file mode 100644 index 00000000..6d93c763 --- /dev/null +++ b/test/data/testpattern.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/dzi-jsonp.js b/test/formats.js similarity index 54% rename from test/dzi-jsonp.js rename to test/formats.js index 08b7da22..23ef1cc4 100644 --- a/test/dzi-jsonp.js +++ b/test/formats.js @@ -1,18 +1,21 @@ (function() { - module('DZI JSONp'); + // This module tests whether our various file formats can be opened. + // TODO: Add more file formats (with corresponding test data). + + module('Formats'); var viewer = null; // ---------- - asyncTest('Open', function() { + var testOpen = function(name) { $(document).ready(function() { var timeWatcher = Util.timeWatcher(); viewer = OpenSeadragon({ id: 'example', prefixUrl: '/build/openseadragon/images/', - tileSources: '/test/data/testpattern.js' + tileSources: '/test/data/' + name }); ok(viewer, 'Viewer exists'); @@ -27,24 +30,34 @@ var tileDrawnHandler = function(eventSender, eventData) { viewer.removeHandler('tile-drawn', tileDrawnHandler); ok(true, 'A tile has been drawn'); + viewer.addHandler('close', closeHandler); + viewer.close(); + }; + + var closeHandler = function() { + viewer.removeHandler('close', closeHandler); + $('#example').empty(); + ok(true, 'Close event was sent'); timeWatcher.done(); }; viewer.addHandler('open', openHandler); }); + }; + + // ---------- + asyncTest('DZI', function() { + testOpen('testpattern.dzi'); }); // ---------- - asyncTest('Close', function() { - var closeHandler = function() { - viewer.removeHandler('close', closeHandler); - $('#example').empty(); - ok(true, 'Close event was sent'); - start(); - }; - - viewer.addHandler('close', closeHandler); - viewer.close(); + asyncTest('DZI JSONp', function() { + testOpen('testpattern.js'); }); - + + // ---------- + asyncTest('DZI XML', function() { + testOpen('testpattern.xml'); + }); + })(); diff --git a/test/test.html b/test/test.html index 92344f56..e34f8bd0 100644 --- a/test/test.html +++ b/test/test.html @@ -17,6 +17,6 @@ - + From ed87ceb23f759f70932780a4ad3fe155edbb94e2 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Mon, 13 May 2013 10:57:16 -0700 Subject: [PATCH 58/71] Sped up animation for basic test --- test/basic.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/basic.js b/test/basic.js index ff302670..3c88242f 100644 --- a/test/basic.js +++ b/test/basic.js @@ -2,7 +2,6 @@ module('Basic'); - // TODO: Tighten up springs and use "immediate" where possible, so tests run faster // TODO: Test drag var viewer = null; @@ -13,7 +12,8 @@ viewer = OpenSeadragon({ id: 'example', prefixUrl: '/build/openseadragon/images/', - tileSources: '/test/data/testpattern.dzi', + tileSources: '/test/data/testpattern.dzi', + springStiffness: 100, // Faster animation = faster tests showNavigator: true }); From f235d7a642b6382fa603181eef08813bbdbe7443 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 13 May 2013 21:54:41 -0400 Subject: [PATCH 59/71] Rename test/util.js to test/test.js since we are about to create a module for testing utility functions. --- test/test.html | 2 +- test/{util.js => test.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename test/{util.js => test.js} (100%) diff --git a/test/test.html b/test/test.html index 92344f56..21bb8b77 100644 --- a/test/test.html +++ b/test/test.html @@ -14,7 +14,7 @@ - + diff --git a/test/util.js b/test/test.js similarity index 100% rename from test/util.js rename to test/test.js From 31d4cc13b791c49fca56a212ea286e2151861878 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 13 May 2013 22:24:04 -0400 Subject: [PATCH 60/71] Add tests for addClass/removeClass --- test/test.html | 1 + test/utils.js | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 test/utils.js diff --git a/test/test.html b/test/test.html index 21bb8b77..ea226cdc 100644 --- a/test/test.html +++ b/test/test.html @@ -17,6 +17,7 @@ + diff --git a/test/utils.js b/test/utils.js new file mode 100644 index 00000000..c61171ee --- /dev/null +++ b/test/utils.js @@ -0,0 +1,52 @@ +(function() { + module("utils"); + + test("addRemoveClass", function() { + var div = OpenSeadragon.makeNeutralElement('div'); + strictEqual(div.className, '', + "makeNeutralElement set no classes"); + + OpenSeadragon.addClass(div, 'foo'); + strictEqual(div.className, 'foo', + "Added first class"); + OpenSeadragon.addClass(div, 'bar'); + strictEqual(div.className, 'foo bar', + "Added second class"); + OpenSeadragon.addClass(div, 'baz'); + strictEqual(div.className, 'foo bar baz', + "Added third class"); + OpenSeadragon.addClass(div, 'plugh'); + strictEqual(div.className, 'foo bar baz plugh', + "Added fourth class"); + + OpenSeadragon.addClass(div, 'foo'); + strictEqual(div.className, 'foo bar baz plugh', + "Re-added first class"); + OpenSeadragon.addClass(div, 'bar'); + strictEqual(div.className, 'foo bar baz plugh', + "Re-added middle class"); + OpenSeadragon.addClass(div, 'plugh'); + strictEqual(div.className, 'foo bar baz plugh', + "Re-added last class"); + + OpenSeadragon.removeClass(div, 'xyzzy'); + strictEqual(div.className, 'foo bar baz plugh', + "Removed nonexistent class"); + OpenSeadragon.removeClass(div, 'ba'); + strictEqual(div.className, 'foo bar baz plugh', + "Removed nonexistent class with existent substring"); + + OpenSeadragon.removeClass(div, 'bar'); + strictEqual(div.className, 'foo baz plugh', + "Removed middle class"); + OpenSeadragon.removeClass(div, 'plugh'); + strictEqual(div.className, 'foo baz', + "Removed last class"); + OpenSeadragon.removeClass(div, 'foo'); + strictEqual(div.className, 'baz', + "Removed first class"); + OpenSeadragon.removeClass(div, 'baz'); + strictEqual(div.className, '', + "Removed only class"); + }); +})(); From fd04647b1bfbdc606dd3d8893a537f0e93fe246a Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 13 May 2013 22:35:27 -0400 Subject: [PATCH 61/71] Test addition/removal of fullpage class on viewer element --- test/basic.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/basic.js b/test/basic.js index ff302670..e3f41f67 100644 --- a/test/basic.js +++ b/test/basic.js @@ -102,6 +102,23 @@ Util.simulateViewerClick(viewer, 0.25, 0.25); }); + // ---------- + test('Fullscreen', function() { + ok(!viewer.isFullPage(), 'Started out not fullpage'); + ok(!$(viewer.element).hasClass('fullpage'), + 'No fullpage class on div'); + + viewer.setFullPage(true); + ok(viewer.isFullPage(), 'Enabled fullpage'); + ok($(viewer.element).hasClass('fullpage'), + 'Fullpage class added to div'); + + viewer.setFullPage(false); + ok(!viewer.isFullPage(), 'Disabled fullpage'); + ok(!$(viewer.element).hasClass('fullpage'), + 'Fullpage class removed from div'); + }); + // ---------- asyncTest('Close', function() { var closeHandler = function() { From 17a6ee15b1f0b0a97f173eb1aec02825d52312dd Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 13 May 2013 23:32:09 -0400 Subject: [PATCH 62/71] Include 2010 in "OpenSeadragon contributors" copyright dates This Git repository starts in 2011, but the CodePlex Mercurial repository has commits from 2010. --- LICENSE.txt | 2 +- src/button.js | 2 +- src/buttongroup.js | 2 +- src/control.js | 2 +- src/controldock.js | 2 +- src/displayrectangle.js | 2 +- src/drawer.js | 2 +- src/dzitilesource.js | 2 +- src/eventhandler.js | 2 +- src/fullscreen.js | 2 +- src/iiiftilesource.js | 2 +- src/legacytilesource.js | 2 +- src/mousetracker.js | 2 +- src/navigator.js | 2 +- src/openseadragon.js | 2 +- src/osmtilesource.js | 2 +- src/overlay.js | 2 +- src/point.js | 2 +- src/profiler.js | 2 +- src/rectangle.js | 2 +- src/referencestrip.js | 2 +- src/spring.js | 2 +- src/strings.js | 2 +- src/tile.js | 2 +- src/tilesource.js | 2 +- src/tilesourcecollection.js | 2 +- src/tmstilesource.js | 2 +- src/viewer.js | 2 +- src/viewport.js | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 6b29093f..d4e25608 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ Copyright (C) 2009 CodePlex Foundation -Copyright (C) 2011-2013 OpenSeadragon contributors +Copyright (C) 2010-2013 OpenSeadragon contributors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/src/button.js b/src/button.js index 88b73df2..b6770788 100644 --- a/src/button.js +++ b/src/button.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/buttongroup.js b/src/buttongroup.js index d0554d98..dddc6463 100644 --- a/src/buttongroup.js +++ b/src/buttongroup.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/control.js b/src/control.js index 69507f5c..867081a9 100644 --- a/src/control.js +++ b/src/control.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/controldock.js b/src/controldock.js index 41e2d43a..57741c45 100644 --- a/src/controldock.js +++ b/src/controldock.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/displayrectangle.js b/src/displayrectangle.js index 0e9623df..a4ea265d 100644 --- a/src/displayrectangle.js +++ b/src/displayrectangle.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/drawer.js b/src/drawer.js index c5520558..464a5693 100644 --- a/src/drawer.js +++ b/src/drawer.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/dzitilesource.js b/src/dzitilesource.js index 1b2b2515..97d87526 100644 --- a/src/dzitilesource.js +++ b/src/dzitilesource.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/eventhandler.js b/src/eventhandler.js index dcbf60de..ebb6e1b5 100644 --- a/src/eventhandler.js +++ b/src/eventhandler.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/fullscreen.js b/src/fullscreen.js index c8715457..f868d7f2 100644 --- a/src/fullscreen.js +++ b/src/fullscreen.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index adf9dab7..0380b1de 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/legacytilesource.js b/src/legacytilesource.js index a6533cff..c4b88fb8 100644 --- a/src/legacytilesource.js +++ b/src/legacytilesource.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/mousetracker.js b/src/mousetracker.js index d8416ad8..5aae7fc5 100644 --- a/src/mousetracker.js +++ b/src/mousetracker.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/navigator.js b/src/navigator.js index bbeab98a..5628bd36 100644 --- a/src/navigator.js +++ b/src/navigator.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/openseadragon.js b/src/openseadragon.js index cc5b567d..3d4d2b3f 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/osmtilesource.js b/src/osmtilesource.js index ca70d857..24ccff5b 100644 --- a/src/osmtilesource.js +++ b/src/osmtilesource.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/overlay.js b/src/overlay.js index 49c862a3..f414674c 100644 --- a/src/overlay.js +++ b/src/overlay.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/point.js b/src/point.js index 2f77bed8..a4017a44 100644 --- a/src/point.js +++ b/src/point.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/profiler.js b/src/profiler.js index ae993840..a404e724 100644 --- a/src/profiler.js +++ b/src/profiler.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/rectangle.js b/src/rectangle.js index cfb249fb..d559a8cf 100644 --- a/src/rectangle.js +++ b/src/rectangle.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/referencestrip.js b/src/referencestrip.js index 8e471922..3eb31ffa 100644 --- a/src/referencestrip.js +++ b/src/referencestrip.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/spring.js b/src/spring.js index 328f2804..179e6797 100644 --- a/src/spring.js +++ b/src/spring.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/strings.js b/src/strings.js index c5168ac4..8b1be14c 100644 --- a/src/strings.js +++ b/src/strings.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/tile.js b/src/tile.js index 32586377..26115e91 100644 --- a/src/tile.js +++ b/src/tile.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/tilesource.js b/src/tilesource.js index 1a2efe53..d9eea113 100644 --- a/src/tilesource.js +++ b/src/tilesource.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/tilesourcecollection.js b/src/tilesourcecollection.js index 1cd62e9a..de6b6933 100644 --- a/src/tilesourcecollection.js +++ b/src/tilesourcecollection.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/tmstilesource.js b/src/tmstilesource.js index d945c790..c782f2e9 100644 --- a/src/tmstilesource.js +++ b/src/tmstilesource.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/viewer.js b/src/viewer.js index 975790a3..8ac282c5 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/viewport.js b/src/viewport.js index 5f5799d2..0bc80fae 100644 --- a/src/viewport.js +++ b/src/viewport.js @@ -2,7 +2,7 @@ * OpenSeadragon * * Copyright (C) 2009 CodePlex Foundation - * Copyright (C) 2011-2013 OpenSeadragon contributors + * Copyright (C) 2010-2013 OpenSeadragon contributors * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are From e50b9007b92ac4029fc9a43090be404a6558fac3 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 13 May 2013 23:37:23 -0400 Subject: [PATCH 63/71] Move project URL above license URL in minified header --- Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index ee063729..649b5abd 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -68,8 +68,8 @@ module.exports = function(grunt) { banner: "//! <%= pkg.name %> <%= pkg.version %>\n" + "//! Built on <%= grunt.template.today('yyyy-mm-dd') %>\n" + "//! Git commit: <%= gitInfo %>\n" - + "//! License: http://openseadragon.github.io/license/\n" - + "//! http://openseadragon.github.io\n\n", + + "//! http://openseadragon.github.io\n" + + "//! License: http://openseadragon.github.io/license/\n\n", process: true }, dist: { From 7939fa7c4d9c631ef0b648f19237f75369b48310 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 13 May 2013 23:39:27 -0400 Subject: [PATCH 64/71] Replace GitHub issue numbers with full URLs --- src/fullscreen.js | 3 ++- src/osmtilesource.js | 2 +- src/tmstilesource.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/fullscreen.js b/src/fullscreen.js index f868d7f2..e2920049 100644 --- a/src/fullscreen.js +++ b/src/fullscreen.js @@ -35,7 +35,8 @@ /* * Implementation and research by John Dyer in: * http://johndyer.name/native-fullscreen-javascript-api-plus-jquery-plugin/ - * John Dyer has released this fullscreen code under the MIT license; see #81. + * John Dyer has released this fullscreen code under the MIT license; see + * . * * Copyright (C) 2011 John Dyer * diff --git a/src/osmtilesource.js b/src/osmtilesource.js index 24ccff5b..5036e7a9 100644 --- a/src/osmtilesource.js +++ b/src/osmtilesource.js @@ -36,7 +36,7 @@ * Derived from the OSM tile source in Rainer Simon's seajax-utils project * . Rainer Simon has contributed * the included code to the OpenSeadragon project under the New BSD license; - * see #58. + * see . */ diff --git a/src/tmstilesource.js b/src/tmstilesource.js index c782f2e9..42bc7591 100644 --- a/src/tmstilesource.js +++ b/src/tmstilesource.js @@ -36,7 +36,7 @@ * Derived from the TMS tile source in Rainer Simon's seajax-utils project * . Rainer Simon has contributed * the included code to the OpenSeadragon project under the New BSD license; - * see #58. + * see . */ From fcc119bb8400d72cdc674f6ffd3dca420de653eb Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 14 May 2013 00:00:24 -0400 Subject: [PATCH 65/71] Add file-specific descriptions to file headers --- src/button.js | 2 +- src/buttongroup.js | 2 +- src/control.js | 2 +- src/controldock.js | 2 +- src/displayrectangle.js | 2 +- src/drawer.js | 2 +- src/dzitilesource.js | 2 +- src/eventhandler.js | 2 +- src/fullscreen.js | 2 +- src/iiiftilesource.js | 2 +- src/legacytilesource.js | 2 +- src/mousetracker.js | 2 +- src/navigator.js | 2 +- src/osmtilesource.js | 2 +- src/overlay.js | 2 +- src/point.js | 2 +- src/profiler.js | 2 +- src/rectangle.js | 2 +- src/referencestrip.js | 2 +- src/spring.js | 2 +- src/strings.js | 2 +- src/tile.js | 2 +- src/tilesource.js | 2 +- src/tilesourcecollection.js | 2 +- src/tmstilesource.js | 2 +- src/viewer.js | 2 +- src/viewport.js | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/button.js b/src/button.js index b6770788..88c73274 100644 --- a/src/button.js +++ b/src/button.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Button * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/buttongroup.js b/src/buttongroup.js index dddc6463..aa0c1bbc 100644 --- a/src/buttongroup.js +++ b/src/buttongroup.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - ButtonGroup * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/control.js b/src/control.js index 867081a9..76d04dd4 100644 --- a/src/control.js +++ b/src/control.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Control * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/controldock.js b/src/controldock.js index 57741c45..3cde67bf 100644 --- a/src/controldock.js +++ b/src/controldock.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - ControlDock * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/displayrectangle.js b/src/displayrectangle.js index a4ea265d..389e9bbd 100644 --- a/src/displayrectangle.js +++ b/src/displayrectangle.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - DisplayRect * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/drawer.js b/src/drawer.js index 464a5693..f6766c4e 100644 --- a/src/drawer.js +++ b/src/drawer.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Drawer * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/dzitilesource.js b/src/dzitilesource.js index 97d87526..b846e441 100644 --- a/src/dzitilesource.js +++ b/src/dzitilesource.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - DziTileSource * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/eventhandler.js b/src/eventhandler.js index ebb6e1b5..a5b2cafc 100644 --- a/src/eventhandler.js +++ b/src/eventhandler.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - EventHandler * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/fullscreen.js b/src/fullscreen.js index e2920049..8419c525 100644 --- a/src/fullscreen.js +++ b/src/fullscreen.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - full-screen support functions * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index 0380b1de..fc711738 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - IIIFTileSource * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/legacytilesource.js b/src/legacytilesource.js index c4b88fb8..b1492cfa 100644 --- a/src/legacytilesource.js +++ b/src/legacytilesource.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - LegacyTileSource * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/mousetracker.js b/src/mousetracker.js index 5aae7fc5..1593839f 100644 --- a/src/mousetracker.js +++ b/src/mousetracker.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - MouseTracker * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/navigator.js b/src/navigator.js index 5628bd36..fd30adbc 100644 --- a/src/navigator.js +++ b/src/navigator.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Navigator * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/osmtilesource.js b/src/osmtilesource.js index 5036e7a9..2dd44c9e 100644 --- a/src/osmtilesource.js +++ b/src/osmtilesource.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - OsmTileSource * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/overlay.js b/src/overlay.js index f414674c..75dba31e 100644 --- a/src/overlay.js +++ b/src/overlay.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Overlay * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/point.js b/src/point.js index a4017a44..a4046bec 100644 --- a/src/point.js +++ b/src/point.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Point * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/profiler.js b/src/profiler.js index a404e724..3525bf15 100644 --- a/src/profiler.js +++ b/src/profiler.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Profiler * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/rectangle.js b/src/rectangle.js index d559a8cf..8e508da9 100644 --- a/src/rectangle.js +++ b/src/rectangle.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Rect * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/referencestrip.js b/src/referencestrip.js index 3eb31ffa..c5c1b688 100644 --- a/src/referencestrip.js +++ b/src/referencestrip.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - ReferenceStrip * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/spring.js b/src/spring.js index 179e6797..fe61fd7a 100644 --- a/src/spring.js +++ b/src/spring.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Spring * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/strings.js b/src/strings.js index 8b1be14c..90c1fe7c 100644 --- a/src/strings.js +++ b/src/strings.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - getString/setString * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/tile.js b/src/tile.js index 26115e91..5b380087 100644 --- a/src/tile.js +++ b/src/tile.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Tile * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/tilesource.js b/src/tilesource.js index d9eea113..1e6a26a4 100644 --- a/src/tilesource.js +++ b/src/tilesource.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - TileSource * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/tilesourcecollection.js b/src/tilesourcecollection.js index de6b6933..1edd38b9 100644 --- a/src/tilesourcecollection.js +++ b/src/tilesourcecollection.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - TileSourceCollection * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/tmstilesource.js b/src/tmstilesource.js index 42bc7591..e4bf0d30 100644 --- a/src/tmstilesource.js +++ b/src/tmstilesource.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - TmsTileSource * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/viewer.js b/src/viewer.js index 8ac282c5..7d2f1576 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Viewer * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors diff --git a/src/viewport.js b/src/viewport.js index 0bc80fae..954ebab3 100644 --- a/src/viewport.js +++ b/src/viewport.js @@ -1,5 +1,5 @@ /* - * OpenSeadragon + * OpenSeadragon - Viewport * * Copyright (C) 2009 CodePlex Foundation * Copyright (C) 2010-2013 OpenSeadragon contributors From 665ecd6655dc40906aa95a94a9bd697688f3c539 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 14 May 2013 00:20:35 -0400 Subject: [PATCH 66/71] Document New BSD license on @jpstroop's IIIF code --- src/iiiftilesource.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index fc711738..cb64abe9 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -32,6 +32,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * The getTileUrl implementation is based on Jon Stroop's Python version, + * which is released under the New BSD license: + * https://gist.github.com/jpstroop/4624253 + */ + + (function( $ ){ /** @@ -39,9 +46,6 @@ * Format: Image API Draft 0.2 - Please read more about the specification * at * - * The getTileUrl implementation is based on the gist from: - * https://gist.github.com/jpstroop/4624253 - * * @class * @extends OpenSeadragon.TileSource * @see http://library.stanford.edu/iiif/image-api/ From 3eb233c35aea168baa6102a1dbeae114f64b31e7 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Tue, 14 May 2013 09:38:04 -0700 Subject: [PATCH 67/71] Updated changelog --- changelog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog.txt b/changelog.txt index b2733f65..1b3314e0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -6,6 +6,8 @@ OPENSEADRAGON CHANGELOG * Fixed a problem with getString when the string property is a sub-property. (#64) * Fixed: Tooltips for Navigation Controls not displaying (#63) * Cleaned up some diagnostic code that was broken. +* Added fullpage class to viewer element when in fullpage mode (#61) +* Reverted to original New BSD license; cleaned up license declarations (#89) 0.9.126: From 1118d411853a2188b5d54c211fb6a2a7b749d035 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Tue, 14 May 2013 09:53:34 -0700 Subject: [PATCH 68/71] Updated version to 0.9.127 --- changelog.txt | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 1b3314e0..6795bed6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,7 @@ OPENSEADRAGON CHANGELOG ======================= -0.9.127: (in progress) +0.9.127: * Fixed a problem with getString when the string property is a sub-property. (#64) * Fixed: Tooltips for Navigation Controls not displaying (#63) diff --git a/package.json b/package.json index 4450061b..43ec5f82 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenSeadragon", - "version": "0.9.126", + "version": "0.9.127", "description": "Provides a smooth, zoomable user interface for HTML/Javascript.", "devDependencies": { "grunt": "~0.4.0", From fd24106db90d7b62805a409fb957835d8884de62 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Tue, 14 May 2013 09:55:19 -0700 Subject: [PATCH 69/71] Added in progress version to changelog --- changelog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog.txt b/changelog.txt index 6795bed6..0a0df215 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,8 @@ OPENSEADRAGON CHANGELOG ======================= +0.9.128: (in progress) + 0.9.127: * Fixed a problem with getString when the string property is a sub-property. (#64) From 2566b2f5cf094fe13594c1ee200903ddcf60e755 Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Tue, 14 May 2013 10:28:44 -0700 Subject: [PATCH 70/71] Separated file JSDoc comment from root object JSDoc comment; fixes doc building --- src/openseadragon.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openseadragon.js b/src/openseadragon.js index 3df12553..41f7df8a 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -98,7 +98,9 @@ * zoom for large resolution images, and complex examples include * zoomable map interfaces driven by SVG files. *

- * + */ + + /** * The root namespace for OpenSeadragon, this function also serves as a single * point of instantiation for an {@link OpenSeadragon.Viewer}, including all * combinations of out-of-the-box configurable features. All utility methods From c78f3ef7434f35607127692e29aca94ea68a5b2e Mon Sep 17 00:00:00 2001 From: Ian Gilman Date: Tue, 14 May 2013 10:29:15 -0700 Subject: [PATCH 71/71] Fixed mislabeled JSDoc comment for OpenSeadragon.Viewer.prototype.open --- src/viewer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/viewer.js b/src/viewer.js index 24c61b20..8be9ec48 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -333,7 +333,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, * implementation. If the object has a property which is a function * named 'getTileUrl', it is treated as a custom TileSource. * @function - * @name OpenSeadragon.Viewer.prototype.openTileSource + * @name OpenSeadragon.Viewer.prototype.open * @param {String|Object|Function} * @return {OpenSeadragon.Viewer} Chainable. */