diff options
| author | Giovane <giovaneliberato@gmail.com> | 2015-09-14 18:42:02 -0300 |
|---|---|---|
| committer | Giovane <giovaneliberato@gmail.com> | 2015-09-15 17:05:33 -0300 |
| commit | 3c20ec828d3a8d5da7bcad4b92c6414f31a32dc6 (patch) | |
| tree | 7e886bbd00fc5b119be675d155b1c74ac2b5a481 | |
| parent | da2e8fa76a1e6daa1c0981c9bb54e04aa2674c98 (diff) | |
#442 Moves feedback files to a dedicated folder.
| -rw-r--r-- | web-ui/app/js/feedback/feedback.js (renamed from web-ui/app/js/page/feedback.js) | 2 | ||||
| -rw-r--r-- | web-ui/app/js/page/default.js | 4 | ||||
| -rw-r--r-- | web-ui/app/js/views/templates.js | 4 | ||||
| -rw-r--r-- | web-ui/app/templates/feedback/feedback.hbs (renamed from web-ui/app/templates/page/feedback.hbs) | 0 | ||||
| -rw-r--r-- | web-ui/test/spec/feedback/feedback.spec.js (renamed from web-ui/test/spec/page/feedback.spec.js) | 2 | ||||
| -rw-r--r-- | web-ui/test/test-main.js | 1 |
6 files changed, 8 insertions, 5 deletions
diff --git a/web-ui/app/js/page/feedback.js b/web-ui/app/js/feedback/feedback.js index 2ced9fee..e98c3e30 100644 --- a/web-ui/app/js/page/feedback.js +++ b/web-ui/app/js/feedback/feedback.js @@ -21,7 +21,7 @@ define(['flight/lib/component', 'views/templates', 'page/events', 'features'], return defineComponent(function () { this.render = function () { - this.$node.html(templates.page.feedback()); + this.$node.html(templates.feedback.feedback()); }; this.onClick = function() { diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js index 42aec759..d0a8fcd7 100644 --- a/web-ui/app/js/page/default.js +++ b/web-ui/app/js/page/default.js @@ -41,9 +41,9 @@ define( 'views/i18n', 'views/recipientListFormatter', 'flight/lib/logger', + 'feedback/feedback', 'page/logout', 'page/logout_shortcut', - 'page/feedback', 'page/version', ], @@ -73,9 +73,9 @@ define( viewI18n, recipientListFormatter, withLogging, + feedback, logout, logoutShortcut, - feedback, version) { 'use strict'; diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js index 1d9861db..77864569 100644 --- a/web-ui/app/js/views/templates.js +++ b/web-ui/app/js/views/templates.js @@ -58,8 +58,10 @@ define(['hbs/templates'], function (templates) { page: { logout: window.Pixelated['app/templates/page/logout.hbs'], logoutShortcut: window.Pixelated['app/templates/page/logout_shortcut.hbs'], - feedback: window.Pixelated['app/templates/page/feedback.hbs'], version: window.Pixelated['app/templates/page/version.hbs'] + }, + feedback: { + feedback: window.Pixelated['app/templates/feedback/feedback.hbs'] } }; diff --git a/web-ui/app/templates/page/feedback.hbs b/web-ui/app/templates/feedback/feedback.hbs index 72f9b94b..72f9b94b 100644 --- a/web-ui/app/templates/page/feedback.hbs +++ b/web-ui/app/templates/feedback/feedback.hbs diff --git a/web-ui/test/spec/page/feedback.spec.js b/web-ui/test/spec/feedback/feedback.spec.js index fd46fe5b..d0f936e8 100644 --- a/web-ui/test/spec/page/feedback.spec.js +++ b/web-ui/test/spec/feedback/feedback.spec.js @@ -1,4 +1,4 @@ -describeComponent('page/feedback', function () { +describeComponent('feedback/feedback', function () { 'use strict'; describe('Feedback form', function () { diff --git a/web-ui/test/test-main.js b/web-ui/test/test-main.js index 9cd5b12a..42ff1ba2 100644 --- a/web-ui/test/test-main.js +++ b/web-ui/test/test-main.js @@ -16,6 +16,7 @@ requirejs.config({ 'flight': 'app/bower_components/flight', 'views': 'app/js/views', 'helpers': 'app/js/helpers', + 'feedback': 'app/js/feedback', 'tags': 'app/js/tags', 'mail_list': 'app/js/mail_list', 'mail_list_actions': 'app/js/mail_list_actions', |