From fe95abca0f315121886c52c9ffaca61f2e4caf48 Mon Sep 17 00:00:00 2001 From: jdescottes Date: Tue, 3 Mar 2015 23:36:12 +0100 Subject: [PATCH] Switch to template for popup preview (easier integration) --- src/index.html | 1 + .../preview/PopupPreviewController.js | 4 ++- src/{ => templates}/popup-preview.html | 26 ++++++------------- 3 files changed, 12 insertions(+), 19 deletions(-) rename src/{ => templates}/popup-preview.html (53%) diff --git a/src/index.html b/src/index.html index 03672105..e7e2770e 100644 --- a/src/index.html +++ b/src/index.html @@ -76,6 +76,7 @@ + diff --git a/src/js/controller/preview/PopupPreviewController.js b/src/js/controller/preview/PopupPreviewController.js index 43dbbe04..1ee91ab3 100644 --- a/src/js/controller/preview/PopupPreviewController.js +++ b/src/js/controller/preview/PopupPreviewController.js @@ -18,7 +18,9 @@ ns.PopupPreviewController.prototype.open = function () { if (!this.isOpen()) { - this.popup = window.open('/popup-preview.html', '', 'width=320,height=320'); + this.popup = window.open('about:blank', '', 'width=320,height=320'); + this.popup.document.body.innerHTML = pskl.utils.Template.get('popup-preview-partial'); + window.setTimeout(this.onPopupLoaded.bind(this), 500); } }; diff --git a/src/popup-preview.html b/src/templates/popup-preview.html similarity index 53% rename from src/popup-preview.html rename to src/templates/popup-preview.html index f4cf3a25..be408762 100644 --- a/src/popup-preview.html +++ b/src/templates/popup-preview.html @@ -1,8 +1,6 @@ - - - +
+ - - \ No newline at end of file + +
\ No newline at end of file