Themes are now cached using sessionStorage in browsers that support it.

rmiddle · Mar 16, 2010 · 681c976 · 681c976
1 parent 73f79be
commit 681c976
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/osimo_editor.js b/osimo_editor.js
@@ -111,6 +111,7 @@ OsimoEditor.prototype.init = function(){
 
     this.options.theme_path = this.options.editor_path + "themes/" + this.options.theme + "/";
     this.template = '';
+    this.template_size = 0;
 	this.controls = new OsimoEditorControls();
 
 	this.injectCSS();
@@ -122,11 +123,14 @@ OsimoEditor.prototype.injectCSS = function(){
 }
 
 OsimoEditor.prototype.loadTheme = function(){
-	/*if(this.template == '' && window.sessionStorage){
-		if(sessionStorage.osimo_bbeditor_theme != null){
-		    this.template = sessionStorage.osimo_bbeditor_theme;
+	if(this.template == '' && 'sessionStorage' in window){
+		var temp = window.sessionStorage.osimo_bbeditor_theme;
+		var temp_size = window.sessionStorage.osimo_bbeditor_theme_size;
+		if(temp != null && temp_size != null && temp_size > 0 && temp.length == temp_size){
+		    this.template = temp;
+		    this.template_size = temp_size;
 		}
-	}*/
+	}
 
 	if(this.template == ''){
 		var obj = this;
@@ -135,11 +139,14 @@ OsimoEditor.prototype.loadTheme = function(){
 			type:'POST',
 			url:obj.options.editor_path+"theme_loader.php",
 			data:postData,
+			dataType:'json',
 			success:function(data){
-				obj.template = data;
-				/*if(window.sessionStorage){
-					sessionStorage.osimo_bbeditor_theme = data;
-				}*/
+				obj.template = data.html;
+				obj.template_size = data.size;
+				if('sessionStorage' in window){
+					window.sessionStorage.osimo_bbeditor_theme = data.html;
+					window.sessionStorage.osimo_bbeditor_theme_size = data.size;
+				}
 				obj.buildEditor();
 			}
 		});

diff --git a/theme_loader.php b/theme_loader.php
@@ -4,9 +4,11 @@
 	$path = pathinfo($_SERVER['PHP_SELF'],PATHINFO_DIRNAME);
 	define("THEMEPATH",$basepath.$path."/themes/".$_POST['theme']."/");
 
-	echo "<div class=\"osimo-editor\">";
-	include("themes/".$_POST['theme']."/template.php");
-	echo "</div>";
+	$html = "<div class=\"osimo-editor\">";
+	$html .= include_contents("themes/".$_POST['theme']."/template.php");
+	$html .= "</div>";
+
+	echo json_encode(array('html'=>$html,'size'=>strlen($html))); exit;
 }
 
 function getFontSelectorItems(){
@@ -71,4 +73,16 @@ function getColorPickerItems(){
 		}
 	}
 }
+
+function include_contents($filename){
+	if (is_file($filename)) {
+	    ob_start();
+	    include $filename;
+	    $contents = ob_get_contents();
+	    ob_end_clean();
+	    return $contents;
+    }
+
+    return false;
+}
 ?>