From 795329d2225ff3b760f7f0ea3bb6b5e68f6c6b5b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Wed, 29 Feb 2012 10:07:53 -0800 Subject: Making class level url template variable Created a class level variable for the URL to be parsed out of the user files. --- js/mediators/io-mediator.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index 6b26668b..e763c67c 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js @@ -38,6 +38,12 @@ exports.IoMediator = Montage.create(Component, { pio: { enumerable: false, value: ProjectIo + }, + //////////////////////////////////////////////////////////////////// + // + appTemplatesUrl: { + enumerable: false, + value: new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi') }, //////////////////////////////////////////////////////////////////// // @@ -209,8 +215,7 @@ exports.IoMediator = Montage.create(Component, { template.document.content.document.head.innerHTML = template.head; //Getting all CSS (style or link) tags var styletags = template.document.content.document.getElementsByTagName('style'), - linktags = template.document.content.document.getElementsByTagName('link'), - url = new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi'); //TODO: Make public into var + linktags = template.document.content.document.getElementsByTagName('link'); //Looping through link tags and removing file recreated elements for (var j in styletags) { if (styletags[j].getAttribute) { @@ -345,7 +350,7 @@ exports.IoMediator = Montage.create(Component, { webgltag.innerHTML = json; } // - return this.getPrettyHtml(template.document.content.document.documentElement.outerHTML.replace(url, '')); + return this.getPrettyHtml(template.document.content.document.documentElement.outerHTML.replace(this.appTemplatesUrl, '')); } }, //////////////////////////////////////////////////////////////////// @@ -354,7 +359,7 @@ exports.IoMediator = Montage.create(Component, { enumerable: false, value: function (list) { //Variable to store CSS definitions - var i, str, url, css = ''; + var i, str, css = ''; //Looping through list if (list && list.length > 0) { //Adding each list item to string and also adding breaks @@ -362,10 +367,8 @@ exports.IoMediator = Montage.create(Component, { css += list[i].cssText; } } - //TODO: Add better logic for creating this string - url = new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi'); //Returning the CSS string - return this.getPrettyCss(css.replace(url, '')); + return this.getPrettyCss(css.replace(this.appTemplatesUrl, '')); } }, //////////////////////////////////////////////////////////////////// -- cgit v1.2.3