Fix for DFL-3712, Edited text in font preview is reset when switching views

p01 · p01 · commit 9259710f0bc4 · 2012-11-13T15:28:14.000+01:00
diff --git a/src/resource-manager/resource_detail_view.js b/src/resource-manager/resource_detail_view.js
@@ -185,6 +185,11 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
     var messages = window.messages;
     messages.add_listener("debug-context-selected", this._on_debug_context_selected_bound);
 
+    window.event_handlers.input["resource-detail-font"] = function(event, target)
+    {
+      window.settings.resource_detail_view.set("sample_string", target.value);
+    };
+
     this.init(id, name, container_class, html, default_handler);
   };
 
@@ -193,6 +198,13 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
 
 cls.ResourceDetailView.create_ui_widgets = function()
 {
+  new Settings(
+    "resource_detail_view",
+    {
+      "sample_string": "The quick brown fox jumps over the lazy dog. 0123456789"
+    }
+  );
+
   new ToolbarConfig(
   {
     view: "resource_detail_view",
diff --git a/src/resource-manager/resource_style.css b/src/resource-manager/resource_style.css
@@ -185,7 +185,8 @@
 .resource-detail-script-container,
 .resource-detail-css-container,
 .resource-detail-markup-container,
-.resource-detail-text-container
+.resource-detail-text-container,
+.resource-detail-font-container
 {
   position: absolute;
   top: 55px;
@@ -261,7 +262,15 @@ a.resource-detail-link:hover
 .resource-detail-font
 {
   width: 100%;
-  height: -o-content-size;
+  height: 100%;
+  border: 0;
+  font-size: 64px;
+  font-family: "the font";
+  box-sizing: border-box;
+  white-space: pre;
+  word-break: break-all;
+  word-wrap: break-word;
+  overflow-wrap: break-word;
 }
 
 .resource-detail-image
diff --git a/src/resource-manager/resource_templates.js b/src/resource-manager/resource_templates.js
@@ -265,7 +265,7 @@ window.templates.resource_detail || (window.templates.resource_detail = new func
 		["div",
 			this.overview(resource),
 			["div",
-				this[type](resource, resource.data),
+				this[type](resource),
 				"class", "resource-detail-" + type + "-container scroll"
 			],
 			"class", "resource-detail-container"
@@ -404,21 +404,12 @@ window.templates.resource_detail || (window.templates.resource_detail = new func
 
 	this.font = function(resource)
 	{
-		var font_family_name = "font" + resource.uid;
-		var style_sheet = "@font-face { font-family: \"" + font_family_name + "\";" +
-										  "src: url(\"" + resource.data.content.stringData + "\"); }";
-		var inline_style = "font-size: 64px; font-family: " + font_family_name + ";" +
-											 "white-space: pre; word-break: break-all; " +
-											 "word-wrap: break-word; overflow-wrap: break-word;";
-		var sample_string = "The quick brown fox jumps over the lazy dog 0123456789";
+		var sample_string = window.settings.resource_detail_view.get("sample_string");
 
 		return(
-		["object",
-			this.fallback(resource),
-			"data", "data:text/html;base64," +
-						  btoa("<!doctype html><style>" + style_sheet + "</style>" +
-						  "<div contenteditable=\"true\" style=\"" + inline_style + "\">" + sample_string),
-			"class", "resource-detail-font"
+		[
+			["style", "@font-face { font-family: \"the font\"; src: url(\"" + resource.data.content.stringData + "\"); }"],
+			["textarea", sample_string, "class", "resource-detail-font", "handler", "resource-detail-font"]
 		]);
 	};
 
