Changed url parameter passing to localStorage

golden-layout · Dec 14, 2014 · e4caa36 · e4caa36
1 parent dfc328a
commit e4caa36
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/src/js/LayoutManager.js b/src/js/LayoutManager.js
@@ -733,14 +733,14 @@ lm.utils.copy( lm.LayoutManager.prototype, {
 	 * @returns {Object} config
 	 */
 	_createConfig: function( config ) {
-		var windowConfig = lm.utils.getQueryStringParam( 'gl-window' );
-
-		if( windowConfig ) {
+		var windowConfigKey = lm.utils.getQueryStringParam( 'gl-window' );
+	
+		if( windowConfigKey ) {
 			this.isSubWindow = true;
-			config = window.decodeURIComponent( windowConfig );
-			config = lm.utils.filterXss( config );
+			config = localStorage.getItem( windowConfigKey );
 			config = JSON.parse( config );
 			config = ( new lm.utils.ConfigMinifier() ).unminifyConfig( config );
+			localStorage.removeItem( windowConfigKey );
 		}
 
 		config = $.extend( true, {}, lm.config.defaultConfig, config );
@@ -770,7 +770,7 @@ lm.utils.copy( lm.LayoutManager.prototype, {
 			this.emit( 'popIn' );
 		}, this));
 
-		document.title = this.config.content[ 0 ].title;
+		document.title = lm.utils.stripTags( this.config.content[ 0 ].title );
 
 		$( 'head' ).append( $( 'body link, body style, template, .gl_keep' ) );
 

diff --git a/src/js/controls/BrowserPopout.js b/src/js/controls/BrowserPopout.js
@@ -193,20 +193,27 @@ lm.utils.copy( lm.controls.BrowserPopout.prototype, {
 	 * @returns {String} URL
 	 */
 	_createUrl: function() {
-		var config = { content: this._config }, 
+		var config = { content: this._config },
+			storageKey = 'gl-window-config-' + lm.utils.getUniqueId(),
 			urlParts;
 
 		config = ( new lm.utils.ConfigMinifier() ).minifyConfig( config );
-		config = window.encodeURIComponent( JSON.stringify( config ) );
+
+		try{
+			localStorage.setItem( storageKey, JSON.stringify( config ) );
+		} catch( e ) {
+			throw new Error( 'Error while writing to localStorage ' + e.toString() );
+		}
+
 		urlParts = document.location.href.split( '?' );
 
 		// URL doesn't contain GET-parameters
 		if( urlParts.length === 1 ) {
-			return urlParts[ 0 ] + '?gl-window=' + config;
+			return urlParts[ 0 ] + '?gl-window=' + storageKey;
 
 		// URL contains GET-parameters
 		} else {
-			return document.location.href + '&gl-window=' + config;
+			return document.location.href + '&gl-window=' + storageKey;
 		}
 	},
 

diff --git a/src/js/controls/DragProxy.js b/src/js/controls/DragProxy.js
@@ -30,7 +30,7 @@ lm.controls.DragProxy = function( x, y, dragListener, layoutManager, contentItem
 
 	this.element = $( lm.controls.DragProxy._template );
 	this.element.css({ left: x, top: y });
-	this.element.find( '.lm_title' ).html( lm.utils.filterXss( this._contentItem.config.title, true ) );
+	this.element.find( '.lm_title' ).html( this._contentItem.config.title );
 	this.childElementContainer = this.element.find( '.lm_content' );
 	this.childElementContainer.append( contentItem.element );
 

diff --git a/src/js/controls/Tab.js b/src/js/controls/Tab.js
@@ -70,7 +70,7 @@ lm.utils.copy( lm.controls.Tab.prototype,{
 	 */
 	setTitle: function( title ) {
 		this.element.attr( 'title', lm.utils.stripTags( title ) );
-		this.titleElement.html( lm.utils.filterXss( title, true ) );
+		this.titleElement.html( title );
 	},
 
 	/**