diff options
Diffstat (limited to 'web-ui/app')
-rw-r--r-- | web-ui/app/index.html | 11 | ||||
-rw-r--r-- | web-ui/app/js/index.js | 20 | ||||
-rw-r--r-- | web-ui/app/js/main.js | 84 | ||||
-rw-r--r-- | web-ui/app/sandbox.html | 4 |
4 files changed, 25 insertions, 94 deletions
diff --git a/web-ui/app/index.html b/web-ui/app/index.html index 4b6a81a0..b40aecdf 100644 --- a/web-ui/app/index.html +++ b/web-ui/app/index.html @@ -92,22 +92,19 @@ </div> </div> -<!--usemin_start--> <script src="assets/bower_components/modernizr/modernizr.js"></script> -<script src="assets/bower_components/lodash/dist/lodash.js"></script> -<script src="assets/bower_components/jquery/dist/jquery.js"></script> +<script src="assets/bower_components/lodash/dist/lodash.min.js"></script> +<script src="assets/bower_components/jquery/dist/jquery.min.js"></script> <script src="assets/bower_components/jquery-ui/jquery-ui.min.js"></script> <script src="assets/bower_components/jquery-file-upload/js/jquery.fileupload.js"></script> -<script src="assets/js/lib/highlightRegex.js"></script> <script src="assets/bower_components/handlebars/handlebars.min.js"></script> <script src="assets/bower_components/typeahead.js/dist/typeahead.bundle.min.js"></script> +<script src="assets/bower_components/iframe-resizer/js/iframeResizer.min.js"></script> <script src="assets/bower_components/foundation/js/foundation.js" ></script> <script src="assets/bower_components/foundation/js/foundation/foundation.reveal.js" ></script> <script src="assets/bower_components/foundation/js/foundation/foundation.offcanvas.js"></script> <script src="assets/js/foundation/initialize_foundation.js"></script> -<script src="assets/bower_components/iframe-resizer/js/iframeResizer.min.js"></script> -<script src="assets/bower_components/requirejs/require.js" data-main="assets/js/main.js"></script> -<!--usemin_end--> +<script src="assets/app.js"></script> </body> </html> diff --git a/web-ui/app/js/index.js b/web-ui/app/js/index.js new file mode 100644 index 00000000..2f06e2b8 --- /dev/null +++ b/web-ui/app/js/index.js @@ -0,0 +1,20 @@ +import 'js/lib/highlightRegex'; +import 'js/monkey_patching/all'; + +import compose from 'flight/lib/compose'; +import registry from 'flight/lib/registry'; +import advice from 'flight/lib/advice'; +import withLogging from 'flight/lib/logger'; +import debug from 'flight/lib/debug'; +import events from 'page/events'; +import initializeDefault from 'page/default'; + +window.Pixelated = window.Pixelated || {}; +window.Pixelated.events = events; + +compose.mixin(registry, [advice.withAdvice, withLogging]); + +debug.enable(true); +debug.events.logAll(); + +initializeDefault(''); diff --git a/web-ui/app/js/main.js b/web-ui/app/js/main.js deleted file mode 100644 index b8836a6b..00000000 --- a/web-ui/app/js/main.js +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2014 ThoughtWorks, Inc. - * - * Pixelated is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Pixelated is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. - */ - -requirejs.config({ - baseUrl: '../assets/', - paths: { - 'mail_list': 'js/mail_list', - 'page': 'js/page', - 'feedback': 'js/feedback', - 'flight': 'bower_components/flight', - 'DOMPurify': 'bower_components/DOMPurify/dist/purify.min', - 'he': 'bower_components/he/he', - 'hbs': 'js/generated/hbs', - 'helpers': 'js/helpers', - 'lib': 'js/lib', - 'views': 'js/views', - 'tags': 'js/tags', - 'mail_list_actions': 'js/mail_list_actions', - 'user_alerts': 'js/user_alerts', - 'mail_view': 'js/mail_view', - 'dispatchers': 'js/dispatchers', - 'services': 'js/services', - 'mixins': 'js/mixins', - 'search': 'js/search', - 'foundation': 'js/foundation', - 'features': 'js/features/features', - 'i18next': 'bower_components/i18next/i18next', - 'i18nextXHRBackend': 'bower_components/i18next-xhr-backend/i18nextXHRBackend', - 'i18nextBrowserLanguageDetector': 'bower_components/i18next-browser-languagedetector/i18nextBrowserLanguageDetector', - 'quoted-printable': 'bower_components/quoted-printable', - 'utf8': 'bower_components/utf8', - 'user_settings': 'js/user_settings' - } -}); - -require([ - 'flight/lib/compose', - 'flight/lib/debug' -], function(compose, debug){ - 'use strict'; - debug.enable(true); - debug.events.logAll(); -}); - -require( - [ - 'flight/lib/compose', - 'flight/lib/registry', - 'flight/lib/advice', - 'flight/lib/logger', - 'flight/lib/debug', - 'page/events', - 'page/default', - 'js/monkey_patching/all' - ], - - function(compose, registry, advice, withLogging, debug, events, initializeDefault, _monkeyPatched) { - 'use strict'; - - window.Pixelated = window.Pixelated || {}; - window.Pixelated.events = events; - - compose.mixin(registry, [advice.withAdvice, withLogging]); - - debug.enable(true); - debug.events.logAll(); - - initializeDefault(''); - } -); diff --git a/web-ui/app/sandbox.html b/web-ui/app/sandbox.html index 8325b0da..3e110977 100644 --- a/web-ui/app/sandbox.html +++ b/web-ui/app/sandbox.html @@ -5,10 +5,8 @@ <meta charset="utf-8"> <link href="css/sandbox.css" rel="stylesheet" type="text/css"> - <!--usemin_start--> - <script src="js/sandbox.js"></script> + <script src="sandbox.js"></script> <script src="bower_components/iframe-resizer/js/iframeResizer.contentWindow.min.js"></script> - <!--usemin_end--> </head> <body></body> |