diff --git a/src/drawer.js b/src/drawer.js
index 54b07281..10165ffb 100644
--- a/src/drawer.js
+++ b/src/drawer.js
@@ -302,6 +302,22 @@ $.Drawer.prototype = /** @lends OpenSeadragon.Drawer.prototype */{
*/
canRotate: function() {
return this.useCanvas;
+ },
+
+ /**
+ * Destroy the drawer (unload current loaded tiles)
+ * @method
+ * @return null
+ */
+ destroy: function() {
+ //unload current loaded tiles (=empty TILE_CACHE)
+ for ( var i = 0; i < this.tilesLoaded.length; ++i ) {
+ this.tilesLoaded[i].unload();
+ }
+
+ //force unloading of current canvas (1x1 will be gc later, trick not necessarily needed)
+ this.canvas.width = 1;
+ this.canvas.height = 1;
}
};
diff --git a/src/mousetracker.js b/src/mousetracker.js
index f92691c8..fd4a1877 100644
--- a/src/mousetracker.js
+++ b/src/mousetracker.js
@@ -252,6 +252,9 @@
destroy: function () {
stopTracking( this );
this.element = null;
+
+ THIS[ this.hash ] = null;
+ delete THIS[ this.hash ];
},
/**
diff --git a/src/viewer.js b/src/viewer.js
index aa4daa64..7ba1e7c0 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -529,6 +529,12 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
* @fires OpenSeadragon.Viewer.event:close
*/
close: function ( ) {
+
+ if ( !THIS[ this.hash ] ) {
+ //this viewer has already been destroyed: returning immediately
+ return this;
+ }
+
if ( this._updateRequestId !== null ) {
$.cancelAnimationFrame( this._updateRequestId );
this._updateRequestId = null;
@@ -542,6 +548,10 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
this.drawersContainer.innerHTML = "";
this.overlaysContainer.innerHTML = "";
+ if ( this.drawer ) {
+ this.drawer.destroy();
+ }
+
this.source = null;
this.drawer = null;
this.drawers = [];
@@ -568,13 +578,26 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
/**
- * Function to destroy the viewer and clean up everything created by
- * OpenSeadragon.
+ * Function to destroy the viewer and clean up everything created by OpenSeadragon.
+ *
+ * Example:
+ * var viewer = OpenSeadragon({
+ * [...]
+ * });
+ *
+ * //when you are done with the viewer:
+ * viewer.destroy();
+ * viewer = null; //important
+ *
* @function
*/
destroy: function( ) {
this.close();
+ //TODO: implement this...
+ //this.unbindSequenceControls()
+ //this.unbindStandardControls()
+
this.removeAllHandlers();
// Go through top element (passed to us) and remove all children
@@ -597,6 +620,9 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
this.outerTracker.destroy();
}
+ THIS[ this.hash ] = null;
+ delete THIS[ this.hash ];
+
// clear all our references to dom objects
this.canvas = null;
this.keyboardCommandArea = null;
diff --git a/test/basic.js b/test/basic.js
index 969f492f..811efd3b 100644
--- a/test/basic.js
+++ b/test/basic.js
@@ -295,6 +295,7 @@
equal(null, viewer.container);
equal(null, viewer.element);
equal(true, closeCalled);
+ viewer = null;
start();
});
viewer.open('/test/data/testpattern.dzi');
diff --git a/test/demo/memorycheck.html b/test/demo/memorycheck.html
new file mode 100644
index 00000000..bebe80da
--- /dev/null
+++ b/test/demo/memorycheck.html
@@ -0,0 +1,57 @@
+
+
+
+ OpenSeadragon Memory Check Demo
+
+
+
+
+
+ Simple demo page to monitor OpenSeadragon Memory Usage.
+
+
+
+
+
+
+
+