diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js index 4c290b105..dabedf1dd 100644 --- a/app/assets/javascripts/app/views.js +++ b/app/assets/javascripts/app/views.js @@ -84,6 +84,14 @@ app.views.Base = Backbone.View.extend({ } return memo } + }, + + destroyModel: function(evt) { + evt && evt.preventDefault(); + if (confirm(Diaspora.I18n.t("confirm_dialog"))) { + this.model.destroy(); + this.remove(); + } } }); diff --git a/app/assets/javascripts/app/views/content_view.js b/app/assets/javascripts/app/views/content_view.js index 68c94fbbd..fc9b46b37 100644 --- a/app/assets/javascripts/app/views/content_view.js +++ b/app/assets/javascripts/app/views/content_view.js @@ -1,5 +1,4 @@ -//= require ./stream_object_view -app.views.Content = app.views.StreamObject.extend({ +app.views.Content = app.views.Base.extend({ events: { "click .expander": "expandPost" }, diff --git a/app/assets/javascripts/app/views/likes_info_view.js b/app/assets/javascripts/app/views/likes_info_view.js index f4f3071bb..bd8b45ac4 100644 --- a/app/assets/javascripts/app/views/likes_info_view.js +++ b/app/assets/javascripts/app/views/likes_info_view.js @@ -1,5 +1,4 @@ -//= require ./stream_object_view -app.views.LikesInfo = app.views.StreamObject.extend({ +app.views.LikesInfo = app.views.Base.extend({ templateName : "likes-info", diff --git a/app/assets/javascripts/app/views/photo_view.js b/app/assets/javascripts/app/views/photo_view.js index 5500a9588..e4035be87 100644 --- a/app/assets/javascripts/app/views/photo_view.js +++ b/app/assets/javascripts/app/views/photo_view.js @@ -1,5 +1,4 @@ -//= require ./stream_object_view -app.views.Photo = app.views.StreamObject.extend({ +app.views.Photo = app.views.Base.extend({ templateName: "photo", diff --git a/app/assets/javascripts/app/views/post_view.js b/app/assets/javascripts/app/views/post_view.js index ea67e5f4c..7d3e25173 100644 --- a/app/assets/javascripts/app/views/post_view.js +++ b/app/assets/javascripts/app/views/post_view.js @@ -1,6 +1,4 @@ -//= require ./stream_object_view - -app.views.Post = app.views.StreamObject.extend({ +app.views.Post = app.views.Base.extend({ presenter : function() { return _.extend(this.defaultPresenter(), { authorIsCurrentUser : this.authorIsCurrentUser(), diff --git a/app/assets/javascripts/app/views/stream_object_view.js b/app/assets/javascripts/app/views/stream_object_view.js deleted file mode 100644 index ff95eeea3..000000000 --- a/app/assets/javascripts/app/views/stream_object_view.js +++ /dev/null @@ -1,13 +0,0 @@ -app.views.StreamObject = app.views.Base.extend({ - destroyModel: function(evt) { - if (evt) { - evt.preventDefault(); - } - if (!confirm(Diaspora.I18n.t("confirm_dialog"))) { - return - } - - this.model.destroy(); - this.remove(); - } -});