From 019c23b5117a0ed42e2b9b40b10bea05300e4217 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Mon, 10 Jun 2013 20:00:14 +0200 Subject: [PATCH] moved html main js files to src --- .jshintrc | 3 +++ src/index.html | 2 +- src/{js/window-loader.js => index.js} | 2 +- src/js/app-controller.js | 9 ++------- src/mail-content.html | 2 +- src/{js/mail-content-loader.js => mail-content.js} | 0 src/mobile.html | 2 +- src/{js/mobile-loader.js => mobile.js} | 0 src/sandbox.html | 2 +- src/{js/sandbox-loader.js => sandbox.js} | 0 10 files changed, 10 insertions(+), 12 deletions(-) rename src/{js/window-loader.js => index.js} (95%) rename src/{js/mail-content-loader.js => mail-content.js} (100%) rename src/{js/mobile-loader.js => mobile.js} (100%) rename src/{js/sandbox-loader.js => sandbox.js} (100%) diff --git a/.jshintrc b/.jshintrc index 69f758e..d03208e 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,8 +1,10 @@ { + "indent": 4, "strict": true, "globalstrict": true, "node": true, "browser": true, + "camelcase": true, "nonew": true, "curly": true, "eqeqeq": true, @@ -32,5 +34,6 @@ ], "globals": { + "app": true } } \ No newline at end of file diff --git a/src/index.html b/src/index.html index f5cbcb5..67583fa 100755 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@ - + diff --git a/src/js/window-loader.js b/src/index.js similarity index 95% rename from src/js/window-loader.js rename to src/index.js index f7a35a6..8af0f76 100644 --- a/src/js/window-loader.js +++ b/src/index.js @@ -1,4 +1,4 @@ -require(['../require-config'], function() { +require(['require-config'], function() { 'use strict'; // Start the main app logic. diff --git a/src/js/app-controller.js b/src/js/app-controller.js index d353142..402340a 100644 --- a/src/js/app-controller.js +++ b/src/js/app-controller.js @@ -24,13 +24,8 @@ define(['js/dao/email-dao'], function(emailDao) { */ self.start = function(callback) { // the views to load - var views = [ - 'login', - 'compose', - 'folderlist', - 'messagelist', - 'messagelistitem', - 'read' + var views = ['login', 'compose', 'folderlist', 'messagelist', + 'messagelistitem', 'read' ]; // are we running in native app or in browser? diff --git a/src/mail-content.html b/src/mail-content.html index 3f108b0..15635d3 100644 --- a/src/mail-content.html +++ b/src/mail-content.html @@ -6,7 +6,7 @@ - + diff --git a/src/js/mail-content-loader.js b/src/mail-content.js similarity index 100% rename from src/js/mail-content-loader.js rename to src/mail-content.js diff --git a/src/mobile.html b/src/mobile.html index 97244a2..75248aa 100644 --- a/src/mobile.html +++ b/src/mobile.html @@ -48,7 +48,7 @@ - + diff --git a/src/js/mobile-loader.js b/src/mobile.js similarity index 100% rename from src/js/mobile-loader.js rename to src/mobile.js diff --git a/src/sandbox.html b/src/sandbox.html index b42eaef..ab2b83e 100644 --- a/src/sandbox.html +++ b/src/sandbox.html @@ -24,7 +24,7 @@ - + diff --git a/src/js/sandbox-loader.js b/src/sandbox.js similarity index 100% rename from src/js/sandbox-loader.js rename to src/sandbox.js