From 06122053b275261c21a373bd3acbd9394534f970 Mon Sep 17 00:00:00 2001 From: Martin Kadlec Date: Tue, 11 Mar 2014 23:31:36 +0100 Subject: [PATCH 1/4] use compiled js files --- index.html | 4 ++-- rss.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 1500c6ba..152ecb22 100644 --- a/index.html +++ b/index.html @@ -4,8 +4,8 @@ Smart RSS - background process - - + + diff --git a/rss.html b/rss.html index 176cdb2e..e33f960f 100644 --- a/rss.html +++ b/rss.html @@ -5,8 +5,8 @@ Smart RSS - - + +
From feed5260489284a421e3b95246c8f6f54a33e4ff Mon Sep 17 00:00:00 2001 From: Martin Kadlec Date: Thu, 13 Mar 2014 11:41:27 +0100 Subject: [PATCH 2/4] remove testing dependencies --- manifest.json | 2 +- scripts/main.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index d54f96c3..7461aaa0 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,7 @@ }, "web_accessible_resources": ["libs/jquery.min.js", "libs/underscore.min.js", "libs/backbone.min.js", "libs/backbone.indexDB.js", "images/icon16_v2.png"], "permissions": ["https://*/*", "storage", "unlimitedStorage", "alarms", "tabs", "contextMenus", "http://*/*"], - "content_security_policy": "script-src 'self' 'unsafe-eval' https://cdnjs.cloudflare.com/ajax/libs/mocha/ https://raw.github.com/chaijs/chai/master/; object-src 'unsafe-eval';", + "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'unsafe-eval';", "browser_action": { "default_title": "Smart RSS", "default_icon": { diff --git a/scripts/main.js b/scripts/main.js index ad2b1d3f..5024582a 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -10,9 +10,9 @@ require.config({ text: '../text', domReady: '../domReady', //mocha: '../../node_modules/mocha/mocha', - mocha: 'https://cdnjs.cloudflare.com/ajax/libs/mocha/1.12.1/mocha.min', + /*mocha: 'https://cdnjs.cloudflare.com/ajax/libs/mocha/1.12.1/mocha.min', mochacss: 'https://cdnjs.cloudflare.com/ajax/libs/mocha/1.12.1/mocha.min.css?nojs', - chai: 'https://raw.github.com/chaijs/chai/master/chai' + chai: 'https://raw.github.com/chaijs/chai/master/chai'*/ }, shim: { @@ -25,10 +25,10 @@ require.config({ }, underscore: { exports: '_' - }, + }/*, mocha: { exports: 'mocha' - } + }*/ } }); From b2e1a87f536a02da611f35a4296a4a75a1c092a6 Mon Sep 17 00:00:00 2001 From: Martin Kadlec Date: Tue, 11 Mar 2014 23:31:36 +0100 Subject: [PATCH 3/4] use compiled js files --- index.html | 4 ++-- rss.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 1500c6ba..152ecb22 100644 --- a/index.html +++ b/index.html @@ -4,8 +4,8 @@ Smart RSS - background process - - + + diff --git a/rss.html b/rss.html index 176cdb2e..e33f960f 100644 --- a/rss.html +++ b/rss.html @@ -5,8 +5,8 @@ Smart RSS - - + +
From c02e8448210fbabea90f5b81f658a9326fcb1a37 Mon Sep 17 00:00:00 2001 From: Martin Kadlec Date: Thu, 13 Mar 2014 11:41:27 +0100 Subject: [PATCH 4/4] remove testing dependencies --- manifest.json | 2 +- scripts/main.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index d54f96c3..7461aaa0 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,7 @@ }, "web_accessible_resources": ["libs/jquery.min.js", "libs/underscore.min.js", "libs/backbone.min.js", "libs/backbone.indexDB.js", "images/icon16_v2.png"], "permissions": ["https://*/*", "storage", "unlimitedStorage", "alarms", "tabs", "contextMenus", "http://*/*"], - "content_security_policy": "script-src 'self' 'unsafe-eval' https://cdnjs.cloudflare.com/ajax/libs/mocha/ https://raw.github.com/chaijs/chai/master/; object-src 'unsafe-eval';", + "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'unsafe-eval';", "browser_action": { "default_title": "Smart RSS", "default_icon": { diff --git a/scripts/main.js b/scripts/main.js index ad2b1d3f..5024582a 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -10,9 +10,9 @@ require.config({ text: '../text', domReady: '../domReady', //mocha: '../../node_modules/mocha/mocha', - mocha: 'https://cdnjs.cloudflare.com/ajax/libs/mocha/1.12.1/mocha.min', + /*mocha: 'https://cdnjs.cloudflare.com/ajax/libs/mocha/1.12.1/mocha.min', mochacss: 'https://cdnjs.cloudflare.com/ajax/libs/mocha/1.12.1/mocha.min.css?nojs', - chai: 'https://raw.github.com/chaijs/chai/master/chai' + chai: 'https://raw.github.com/chaijs/chai/master/chai'*/ }, shim: { @@ -25,10 +25,10 @@ require.config({ }, underscore: { exports: '_' - }, + }/*, mocha: { exports: 'mocha' - } + }*/ } });