From 80ac930684255dd24cecae70b488285a6058488e Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 1 Mar 2012 13:34:45 -0800
Subject: Optimizing URL intercepting detection

Modified the way the webRequest maps to the file.
---
 js/controllers/document-controller.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'js/controllers/document-controller.js')

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 64ff2c7e..194496a6 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -76,11 +76,14 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 	//
     handleWebRequest: {
     	value: function (request) {
-    		if (this._hackRootFlag && request.url.indexOf('js/document/templates/montage-html') !== -1) {
+    		//TODO: Check if frameId is proper
+    		if (this._hackRootFlag && request.parentFrameId !== -1) {
     			//TODO: Optimize creating string
-					return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
-				}
+    			//console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url);
+				//return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split('/')[request.url.split('/').length-1]};
+				return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]+request.url.split(chrome.extension.getURL('js/document/templates/montage-html/'))[1]};
 			}
+		}
     },
     ////////////////////////////////////////////////////////////////////
 	//
-- 
cgit v1.2.3