Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Matt <lukas@zauberstuhl.de>2014-02-24 20:57:59 +0400
committerLukas Matt <lukas@zauberstuhl.de>2014-05-15 15:23:43 +0400
commitd23f4a66da8783c9b4550f67261c8d9c16947264 (patch)
tree64891a97c8a951f2ea08157aa3e0b755296b6e56
parent1748d3b9402c6b04b4a1e1bc9b71c7f7d3a3c62c (diff)
Cleaned javascript report view
-rw-r--r--app/assets/javascripts/app/models/report.js5
-rw-r--r--app/assets/javascripts/app/views.js14
-rw-r--r--app/assets/javascripts/app/views/comment_view.js14
-rw-r--r--app/assets/javascripts/app/views/feedback_view.js14
-rw-r--r--app/assets/javascripts/app/views/post_view.js15
5 files changed, 14 insertions, 48 deletions
diff --git a/app/assets/javascripts/app/models/report.js b/app/assets/javascripts/app/models/report.js
index 594c7565b..394aa0ce4 100644
--- a/app/assets/javascripts/app/models/report.js
+++ b/app/assets/javascripts/app/models/report.js
@@ -1,8 +1,3 @@
app.models.Report = Backbone.Model.extend({
urlRoot: '/report',
-
- getReason: function() {
- return prompt(Diaspora.I18n.t('report_prompt'), Diaspora.I18n.t('report_prompt_default'));
- }
-
});
diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js
index f5c17c0f9..8ff682cc1 100644
--- a/app/assets/javascripts/app/views.js
+++ b/app/assets/javascripts/app/views.js
@@ -81,6 +81,20 @@ app.views.Base = Backbone.View.extend({
}
},
+ report: function(evt) {
+ if(evt) { evt.preventDefault(); }
+ var msg = prompt(Diaspora.I18n.t('report_prompt'), Diaspora.I18n.t('report_prompt_default'));
+ if (msg !== null) {
+ var report = new app.models.Report();
+ var id = this.model.id;
+ var type = $(evt.currentTarget).data("type");
+ report.fetch({
+ data: { id: id, type: type, text: msg },
+ type: 'POST'
+ });
+ }
+ },
+
destroyModel: function(evt) {
evt && evt.preventDefault();
var self = this;
diff --git a/app/assets/javascripts/app/views/comment_view.js b/app/assets/javascripts/app/views/comment_view.js
index a02676fff..540c54b99 100644
--- a/app/assets/javascripts/app/views/comment_view.js
+++ b/app/assets/javascripts/app/views/comment_view.js
@@ -32,20 +32,6 @@ app.views.Comment = app.views.Content.extend({
canRemove : function() {
return app.currentUser.authenticated() && (this.ownComment() || this.postOwner())
- },
-
- report: function(evt) {
- if(evt) { evt.preventDefault(); }
- var report = new app.models.Report();
- var msg = report.getReason();
- if (msg !== null) {
- var id = this.model.id;
- var type = $(evt.currentTarget).data("type");
- report.fetch({
- data: { id: id, type: type, text: msg },
- type: 'POST'
- });
- }
}
});
diff --git a/app/assets/javascripts/app/views/feedback_view.js b/app/assets/javascripts/app/views/feedback_view.js
index 62e898f04..41e957c89 100644
--- a/app/assets/javascripts/app/views/feedback_view.js
+++ b/app/assets/javascripts/app/views/feedback_view.js
@@ -45,19 +45,5 @@ app.views.Feedback = app.views.Base.extend({
if( app.currentUser.authenticated() ) { return }
alert("you must be logged in to do that!")
return false;
- },
-
- report: function(evt) {
- if(evt) { evt.preventDefault(); }
- var report = new app.models.Report();
- var msg = report.getReason();
- if (msg !== null) {
- var id = this.model.id;
- var type = $(evt.currentTarget).data("type");
- report.fetch({
- data: { id: id, type: type, text: msg },
- type: 'POST'
- });
- }
}
});
diff --git a/app/assets/javascripts/app/views/post_view.js b/app/assets/javascripts/app/views/post_view.js
index 9aef82728..7d45e6bdf 100644
--- a/app/assets/javascripts/app/views/post_view.js
+++ b/app/assets/javascripts/app/views/post_view.js
@@ -13,20 +13,5 @@ app.views.Post = app.views.Base.extend({
showPost : function() {
return (app.currentUser.get("showNsfw")) || !this.model.get("nsfw")
- },
-
- report: function(evt) {
- if(evt) { evt.preventDefault(); }
- var report = new app.models.Report();
- var msg = report.getReason();
- if (msg !== null) {
- var id = this.model.id;
- var type = $(evt.currentTarget).data("type");
- report.fetch({
- data: { id: id, type: type, text: msg },
- type: 'POST'
- });
- }
}
-
});