diff --git a/Changelog.md b/Changelog.md index 1127b8c05dd5dfa44957e323fb812a88b0bab82d..f6ba74c6b0911bb7e84bb3f1ed431491a70739c2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ * Improve invoking mobile site in the testsuite [#5915](https://github.com/diaspora/diaspora/pull/5915) * Do not retry a couple of unrecoverable job failures [#5938](https://github.com/diaspora/diaspora/pull/5938) [#5942](https://github.com/diaspora/diaspora/pull/5943) * Remove some old temporary workarounds [#5964](https://github.com/diaspora/diaspora/pull/5964) +* Remove unused `hasPhotos` and `hasText` functions [#5969](https://github.com/diaspora/diaspora/pull/5969) ## Bug fixes * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846) diff --git a/app/assets/javascripts/app/models/post.js b/app/assets/javascripts/app/models/post.js index 30da8f71c30becb9c62a31ddd3f1a75003f6680c..8335f5a0d66e85c71f6a1f3ad8b0d53e270c1f4c 100644 --- a/app/assets/javascripts/app/models/post.js +++ b/app/assets/javascripts/app/models/post.js @@ -61,14 +61,6 @@ app.models.Post = Backbone.Model.extend(_.extend({}, app.models.formatDateMixin, preloadOrFetch : function(){ var action = app.hasPreload("post") ? this.set(app.parsePreload("post")) : this.fetch(); return $.when(action); - }, - - hasPhotos : function(){ - return this.get("photos") && this.get("photos").length > 0; - }, - - hasText : function(){ - return $.trim(this.get("text")) !== ""; } })); // @license-end diff --git a/spec/javascripts/app/models/post_spec.js b/spec/javascripts/app/models/post_spec.js index b644e26be0d2bdd94e2acd5761d0c6bc4eccc3c3..dc03245a3b07b26e49fe6468c419a188a0168327 100644 --- a/spec/javascripts/app/models/post_spec.js +++ b/spec/javascripts/app/models/post_spec.js @@ -36,28 +36,4 @@ describe("app.models.Post", function() { expect(this.post.createdAt()).toEqual(+date); }); }); - - describe("hasPhotos", function(){ - it('returns true if the model has more than one photo', function(){ - this.post.set({photos : [1,2]}); - expect(this.post.hasPhotos()).toBeTruthy(); - }); - - it('returns false if the model does not have any photos', function(){ - this.post.set({photos : []}); - expect(this.post.hasPhotos()).toBeFalsy(); - }); - }); - - describe("hasText", function(){ - it('returns true if the model has text', function(){ - this.post.set({text : "hella"}); - expect(this.post.hasText()).toBeTruthy(); - }); - - it('returns false if the model does not have text', function(){ - this.post.set({text : " "}); - expect(this.post.hasText()).toBeFalsy(); - }); - }); });