summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
authorGiovane <giovaneliberato@gmail.com>2015-09-15 16:47:33 -0300
committerGiovane <giovaneliberato@gmail.com>2015-09-15 17:06:54 -0300
commit9bb73608765fa413623689fde672c7b3b4fd01f9 (patch)
treec2f6601ccc99dd2705652be907230743d7c0a4de /web-ui
parent78ece9852d5584e0681b4fffd91c704bd9919a1c (diff)
#442 Renames feedback box trigger files
Diffstat (limited to 'web-ui')
-rw-r--r--web-ui/app/js/feedback/feedback_trigger.js (renamed from web-ui/app/js/feedback/feedback.js)0
-rw-r--r--web-ui/app/js/page/default.js2
-rw-r--r--web-ui/app/js/views/templates.js2
-rw-r--r--web-ui/app/templates/feedback/feedback_trigger.hbs (renamed from web-ui/app/templates/feedback/feedback.hbs)0
-rw-r--r--web-ui/test/spec/feedback/feedback_trigger.spec.js (renamed from web-ui/test/spec/feedback/feedback.spec.js)2
5 files changed, 3 insertions, 3 deletions
diff --git a/web-ui/app/js/feedback/feedback.js b/web-ui/app/js/feedback/feedback_trigger.js
index e98c3e30..e98c3e30 100644
--- a/web-ui/app/js/feedback/feedback.js
+++ b/web-ui/app/js/feedback/feedback_trigger.js
diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js
index 08296c33..e060714d 100644
--- a/web-ui/app/js/page/default.js
+++ b/web-ui/app/js/page/default.js
@@ -43,7 +43,7 @@ define(
'flight/lib/logger',
'page/logout',
'page/logout_shortcut',
- 'feedback/feedback',
+ 'feedback/feedback_trigger',
'feedback/compose_feedback',
'page/version',
],
diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js
index d0fc9893..2a990c7f 100644
--- a/web-ui/app/js/views/templates.js
+++ b/web-ui/app/js/views/templates.js
@@ -61,7 +61,7 @@ define(['hbs/templates'], function (templates) {
version: window.Pixelated['app/templates/page/version.hbs']
},
feedback: {
- feedback: window.Pixelated['app/templates/feedback/feedback.hbs'],
+ feedback: window.Pixelated['app/templates/feedback/feedback_trigger.hbs'],
compose_feedback: window.Pixelated['app/templates/feedback/compose_feedback.hbs']
}
};
diff --git a/web-ui/app/templates/feedback/feedback.hbs b/web-ui/app/templates/feedback/feedback_trigger.hbs
index 7f3f8ef1..7f3f8ef1 100644
--- a/web-ui/app/templates/feedback/feedback.hbs
+++ b/web-ui/app/templates/feedback/feedback_trigger.hbs
diff --git a/web-ui/test/spec/feedback/feedback.spec.js b/web-ui/test/spec/feedback/feedback_trigger.spec.js
index f7011ea9..66a31781 100644
--- a/web-ui/test/spec/feedback/feedback.spec.js
+++ b/web-ui/test/spec/feedback/feedback_trigger.spec.js
@@ -1,4 +1,4 @@
-describeComponent('feedback/feedback', function () {
+describeComponent('feedback/feedback_trigger', function () {
'use strict';
describe('Feedback link', function () {