summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--web-ui/app/js/dispatchers/right_pane_dispatcher.js4
-rw-r--r--web-ui/app/js/mail_view/ui/compose_feedback.js (renamed from web-ui/app/js/feedback/compose_feedback.js)4
-rw-r--r--web-ui/app/js/page/default.js2
-rw-r--r--web-ui/app/js/views/templates.js6
-rw-r--r--web-ui/app/templates/compose/feedback_box.hbs (renamed from web-ui/app/templates/feedback/compose_feedback.hbs)0
-rw-r--r--web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js3
6 files changed, 9 insertions, 10 deletions
diff --git a/web-ui/app/js/dispatchers/right_pane_dispatcher.js b/web-ui/app/js/dispatchers/right_pane_dispatcher.js
index 7de6f07a..47339e7d 100644
--- a/web-ui/app/js/dispatchers/right_pane_dispatcher.js
+++ b/web-ui/app/js/dispatchers/right_pane_dispatcher.js
@@ -23,7 +23,7 @@ define(
'mail_view/ui/reply_section',
'mail_view/ui/draft_box',
'mail_view/ui/no_message_selected_pane',
- 'feedback/compose_feedback',
+ 'mail_view/ui/compose_feedback',
'page/events'
],
@@ -65,7 +65,7 @@ define(
this.openFeedbackBox = function() {
var stage = this.reset(this.attr.feedbackBox);
FeedbackBox.attachTo(stage);
- }
+ };
this.openMail = function(ev, data) {
var stage = this.reset(this.attr.mailView);
diff --git a/web-ui/app/js/feedback/compose_feedback.js b/web-ui/app/js/mail_view/ui/compose_feedback.js
index 6fc454e0..4d506864 100644
--- a/web-ui/app/js/feedback/compose_feedback.js
+++ b/web-ui/app/js/mail_view/ui/compose_feedback.js
@@ -21,13 +21,13 @@ define(['flight/lib/component', 'views/templates', 'page/events', 'features'],
return defineComponent(function () {
this.render = function () {
- this.$node.html(templates.feedback.compose_feedback());
+ this.$node.html(templates.compose.feedback());
};
this.openComposeBox = function() {
var stage = this.reset('compose-box');
this.attachTo(stage);
- }
+ };
this.after('initialize', function () {
if (features.isEnabled('feedback')) {
diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js
index e060714d..83bd975f 100644
--- a/web-ui/app/js/page/default.js
+++ b/web-ui/app/js/page/default.js
@@ -44,7 +44,7 @@ define(
'page/logout',
'page/logout_shortcut',
'feedback/feedback_trigger',
- 'feedback/compose_feedback',
+ 'mail_view/ui/compose_feedback',
'page/version',
],
diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js
index 2a990c7f..61fb0486 100644
--- a/web-ui/app/js/views/templates.js
+++ b/web-ui/app/js/views/templates.js
@@ -25,7 +25,8 @@ define(['hbs/templates'], function (templates) {
replySection: window.Pixelated['app/templates/compose/reply_section.hbs'],
recipientInput: window.Pixelated['app/templates/compose/recipient_input.hbs'],
fixedRecipient: window.Pixelated['app/templates/compose/fixed_recipient.hbs'],
- recipients: window.Pixelated['app/templates/compose/recipients.hbs']
+ recipients: window.Pixelated['app/templates/compose/recipients.hbs'],
+ feedback: window.Pixelated['app/templates/compose/feedback_box.hbs']
},
tags: {
tagList: window.Pixelated['app/templates/tags/tag_list.hbs'],
@@ -61,8 +62,7 @@ define(['hbs/templates'], function (templates) {
version: window.Pixelated['app/templates/page/version.hbs']
},
feedback: {
- feedback: window.Pixelated['app/templates/feedback/feedback_trigger.hbs'],
- compose_feedback: window.Pixelated['app/templates/feedback/compose_feedback.hbs']
+ feedback: window.Pixelated['app/templates/feedback/feedback_trigger.hbs']
}
};
diff --git a/web-ui/app/templates/feedback/compose_feedback.hbs b/web-ui/app/templates/compose/feedback_box.hbs
index 42dbf47d..42dbf47d 100644
--- a/web-ui/app/templates/feedback/compose_feedback.hbs
+++ b/web-ui/app/templates/compose/feedback_box.hbs
diff --git a/web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js b/web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js
index f5386b85..1270fc4c 100644
--- a/web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js
+++ b/web-ui/test/spec/dispatchers/right_pane_dispatcher.spec.js
@@ -54,7 +54,7 @@ describeComponent('dispatchers/right_pane_dispatcher', function () {
});
it('listens to open feedback event and open feedback box', function () {
- var feedbackBox = require('feedback/compose_feedback');
+ var feedbackBox = require('mail_view/ui/compose_feedback');
spyOn(feedbackBox, 'attachTo');
this.component.trigger(document, Pixelated.events.ui.feedback.open);
@@ -62,7 +62,6 @@ describeComponent('dispatchers/right_pane_dispatcher', function () {
expect(feedbackBox.attachTo).toHaveBeenCalled();
});
-
});
it('listens to open a draft and creates it', function () {