diff options
author | Anike Arni <anikarni@gmail.com> | 2016-12-30 10:09:22 -0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-30 10:09:22 -0200 |
commit | a86c55a4baf36c711d946331ea3637ce5a6049f7 (patch) | |
tree | 0ef0b40ffa6af7f0d14d5c40062bc7978c67aebc /web-ui/app/js | |
parent | 6141facf1b8bb6789a2d89270723b1df0d7afcf4 (diff) | |
parent | 413672fdba891168301c853c679f21700ebaeb90 (diff) |
Merge pull request #893 from pixelated/webpack
Transition from require to webpack
Diffstat (limited to 'web-ui/app/js')
-rw-r--r-- | web-ui/app/js/index.js | 20 | ||||
-rw-r--r-- | web-ui/app/js/main.js | 84 |
2 files changed, 20 insertions, 84 deletions
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(''); - } -); |