From 9636f372a4910834b117502de5157e37a18fa38c Mon Sep 17 00:00:00 2001 From: Faldrian Date: Sun, 3 Aug 2014 17:17:12 +0200 Subject: [PATCH] inserted line breaks and wrote a test for app.views.Content.smallPhotos --- app/assets/javascripts/widgets/lightbox.js | 9 ++++++--- spec/javascripts/app/views/content_view_spec.js | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 spec/javascripts/app/views/content_view_spec.js diff --git a/app/assets/javascripts/widgets/lightbox.js b/app/assets/javascripts/widgets/lightbox.js index f7f8d1f15..d896937fc 100644 --- a/app/assets/javascripts/widgets/lightbox.js +++ b/app/assets/javascripts/widgets/lightbox.js @@ -60,13 +60,15 @@ jQuery.fn.center = (function() { self.scrollleft.click(function(evt){ evt.preventDefault(); evt.stopPropagation(); - self.navigation.animate({scrollLeft: (self.navigation.scrollLeft() - (self.window.width() - 150))}, 200, 'swing'); + self.navigation.animate({scrollLeft: (self.navigation.scrollLeft() + - (self.window.width() - 150))}, 200, 'swing'); }); self.scrollright.click(function(evt){ evt.preventDefault(); evt.stopPropagation(); - self.navigation.animate({scrollLeft: (self.navigation.scrollLeft() + (self.window.width() - 150))}, 200, 'swing'); + self.navigation.animate({scrollLeft: (self.navigation.scrollLeft() + + (self.window.width() - 150))}, 200, 'swing'); }); self.body.keydown(function(evt) { @@ -148,7 +150,8 @@ jQuery.fn.center = (function() { }; this.scrollToThumbnail = function(imageThumb) { - self.navigation.animate({scrollLeft: (self.navigation.scrollLeft() + imageThumb.offset().left +35 - (self.window.width() / 2))}, 200, 'swing'); + self.navigation.animate({scrollLeft: (self.navigation.scrollLeft() + + imageThumb.offset().left +35 - (self.window.width() / 2))}, 200, 'swing'); } this.selectImage = function(imageThumb) { diff --git a/spec/javascripts/app/views/content_view_spec.js b/spec/javascripts/app/views/content_view_spec.js new file mode 100644 index 000000000..d7a4442d6 --- /dev/null +++ b/spec/javascripts/app/views/content_view_spec.js @@ -0,0 +1,15 @@ +describe("app.views.Content", function(){ + beforeEach(function(){ + this.post = new app.models.StatusMessage(); + this.view = new app.views.Content({model : this.post}) + }); + + describe("rendering", function(){ + + it("should return all but the first photo from the post", function() { + this.post.set({photos : [1,2]}) // set 2 Photos + expect(this.view.smallPhotos().length).toEqual(1) + }); + + }); +}); \ No newline at end of file