Commit Graph

18 Commits

Author SHA1 Message Date
Phil Hughes fa2af5e0f5
Flash is now a ES6 module
Reduced the technical debt around our JS flash function by making it a
module that is imported rather than relying on the global function.
The global function still exists mainly for technical debt with how
some requests are being completed, but new JS should import the module
directly.

Also reduces some tech debt in the file by removing the need for jQuery.
Instead Flash is now 100% vanilla JS.
2017-10-10 10:14:22 +01:00
Mike Greiling d9dedc36c3 remove Vue from the global space 2017-03-20 22:12:01 -05:00
winniehell 572f9782d5 Remove .es6 from file extensions (!9241) 2017-03-05 21:22:40 +01:00
Mike Greiling 83ecc02daa resolve all prefer-const eslint violations 2017-01-18 20:33:02 -06:00
Mike Greiling ccada28f30 resolve all padded-blocks eslint violations 2017-01-18 17:16:41 -06:00
Mike Greiling e7b5945c59 resolve all semi and no-extra-semi eslint violations 2017-01-18 17:15:27 -06:00
Mike Greiling 23f5865e18 expand remaining non-explicit eslint-disable blocks and factor out globals when no-undef encountered 2016-12-13 21:07:31 -06:00
Alfredo Sumaran 6dbca36490 Fix Merge Conflicts app to make it work with Vue 2 2016-11-10 17:53:34 +03:00
Fatih Acet a1fc04dfad VueJSMigration: Remove parallel-conflict-line component.
It's because Vue says: "Component template should contain exactly one root element".
2016-11-10 17:53:34 +03:00
Fatih Acet 99b421da2c Migrate Vue v1 to v2. 2016-11-10 17:53:34 +03:00
winniehell 02f94cf038 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
Alfredo Sumaran 28dbfd5c4c Provide better error message to the user 2016-10-17 12:43:17 -05:00
Alfredo Sumaran f5de2ce3fd Add syntax highlighting to files 2016-10-13 14:16:35 -05:00
Alfredo Sumaran c4142cf9c0 Improve components for PhantomJs compatibility 2016-10-13 14:16:35 -05:00
Alfredo Sumaran 197ac5ebbf Ability to resolve conflicts for files with `text-editor` as conflict type 2016-10-13 14:16:35 -05:00
Alfredo Sumaran a8ac9089af Refactor JS code
- Use a store base object to manage application state.
- Add a service to handle ajax requests.
- Load code only when needed
2016-10-13 14:16:35 -05:00
Alfredo Sumaran a3eb39a106 Replace textarea with Ace editor 2016-10-13 14:16:34 -05:00
Alfredo Sumaran 26f658decd Implement editor to manually resolve merge conflicts 2016-10-13 14:16:34 -05:00