From 411e1f8cfa06fbd049fb055a4f453b56acdb7153 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 27 Dec 2016 11:21:12 -0200 Subject: Adds index file for loading app with webpack --- web-ui/app/js/index.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 web-ui/app/js/index.js (limited to 'web-ui/app/js') diff --git a/web-ui/app/js/index.js b/web-ui/app/js/index.js new file mode 100644 index 00000000..081fe51c --- /dev/null +++ b/web-ui/app/js/index.js @@ -0,0 +1,18 @@ +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' +import 'js/monkey_patching/all' + +window.Pixelated = window.Pixelated || {} +window.Pixelated.events = events + +compose.mixin(registry, [advice.withAdvice, withLogging]) + +debug.enable(true) +debug.events.logAll() + +initializeDefault('') -- cgit v1.2.3 From df7c34ec46cf4f11699a4a673d6bffe50a5b216e Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 27 Dec 2016 15:33:22 -0200 Subject: Fixes jshint by adding semicolon in index.js --- web-ui/app/js/index.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'web-ui/app/js') diff --git a/web-ui/app/js/index.js b/web-ui/app/js/index.js index 081fe51c..690c086b 100644 --- a/web-ui/app/js/index.js +++ b/web-ui/app/js/index.js @@ -1,18 +1,18 @@ -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' -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'; +import 'js/monkey_patching/all'; -window.Pixelated = window.Pixelated || {} -window.Pixelated.events = events +window.Pixelated = window.Pixelated || {}; +window.Pixelated.events = events; -compose.mixin(registry, [advice.withAdvice, withLogging]) +compose.mixin(registry, [advice.withAdvice, withLogging]); -debug.enable(true) -debug.events.logAll() +debug.enable(true); +debug.events.logAll(); -initializeDefault('') +initializeDefault(''); -- cgit v1.2.3 From 4120bb6063d277179a86a1b9cea6caae3aa676ba Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 28 Dec 2016 15:10:46 -0200 Subject: Bundles local files that were previously in script tags with webpack for optimization --- web-ui/app/js/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'web-ui/app/js') diff --git a/web-ui/app/js/index.js b/web-ui/app/js/index.js index 690c086b..8ec2eeab 100644 --- a/web-ui/app/js/index.js +++ b/web-ui/app/js/index.js @@ -1,3 +1,7 @@ +import 'js/foundation/initialize_foundation'; +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'; @@ -5,7 +9,6 @@ import withLogging from 'flight/lib/logger'; import debug from 'flight/lib/debug'; import events from 'page/events'; import initializeDefault from 'page/default'; -import 'js/monkey_patching/all'; window.Pixelated = window.Pixelated || {}; window.Pixelated.events = events; -- cgit v1.2.3 From b0eef380feab59153fbaa9b11084bd4def91ec5b Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 28 Dec 2016 16:16:56 -0200 Subject: Move foundation from bower to npm and package them with webpack --- web-ui/app/js/index.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'web-ui/app/js') diff --git a/web-ui/app/js/index.js b/web-ui/app/js/index.js index 8ec2eeab..724643c5 100644 --- a/web-ui/app/js/index.js +++ b/web-ui/app/js/index.js @@ -1,3 +1,6 @@ +import 'foundation-sites'; +import 'foundation-sites/js/foundation.reveal.js'; +import 'foundation-sites/js/foundation.offcanvas.js'; import 'js/foundation/initialize_foundation'; import 'js/lib/highlightRegex'; import 'js/monkey_patching/all'; -- cgit v1.2.3 From 86e464682533e6d21f7f5c69dc091532df4c6dbc Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 28 Dec 2016 19:02:50 -0200 Subject: Fixes offcanvas menu by moving foundation back to index.html --- web-ui/app/js/index.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'web-ui/app/js') diff --git a/web-ui/app/js/index.js b/web-ui/app/js/index.js index 724643c5..2f06e2b8 100644 --- a/web-ui/app/js/index.js +++ b/web-ui/app/js/index.js @@ -1,7 +1,3 @@ -import 'foundation-sites'; -import 'foundation-sites/js/foundation.reveal.js'; -import 'foundation-sites/js/foundation.offcanvas.js'; -import 'js/foundation/initialize_foundation'; import 'js/lib/highlightRegex'; import 'js/monkey_patching/all'; -- cgit v1.2.3 From 413672fdba891168301c853c679f21700ebaeb90 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 29 Dec 2016 11:42:11 -0200 Subject: Delete require config file main.js --- web-ui/app/js/main.js | 84 --------------------------------------------------- 1 file changed, 84 deletions(-) delete mode 100644 web-ui/app/js/main.js (limited to 'web-ui/app/js') 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 . - */ - -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(''); - } -); -- cgit v1.2.3