diff --git a/config/assets.yml b/config/assets.yml index 31dd371be6efe880ec96c6f81a3b5343008c8343..8240598392264df7ca5fada2529fbdb46c2c5e0f 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -1,4 +1,4 @@ -package_assets: on +package_assets: always embed_assets: datauri compress_assets: on gzip_assets: off @@ -43,14 +43,19 @@ javascripts: - public/javascripts/app/helpers/* - public/javascripts/app/router.js - public/javascripts/app/views.js - - public/javascripts/app/models/post.js + - public/javascripts/app/models/post.js - public/javascripts/app/models/* - public/javascripts/app/pages/* - public/javascripts/app/collections/* - public/javascripts/app/views/stream_object_view.js - public/javascripts/app/views/content_view.js - public/javascripts/app/views/*.js - - public/javascripts/app/views/**/*.js + - public/javascripts/app/views/**/*.js + + - public/javascripts/diaspora.js + - public/javascripts/helpers/*.js + - public/javascripts/pages/*.js + - public/javascripts/widgets/*.js - public/javascripts/diaspora.js - public/javascripts/helpers/*.js diff --git a/public/javascripts/app/models/like.js b/public/javascripts/app/models/like.js index 534317c8aa64b29d920d24478997a78577473871..81e71a61e306d973d2e63ee90febe6636dc1e726 100644 --- a/public/javascripts/app/models/like.js +++ b/public/javascripts/app/models/like.js @@ -1 +1 @@ -app.models.Like = Backbone.Model.extend({ }) +app.models.Like = Backbone.Model.extend({ }); diff --git a/public/javascripts/app/models/participation.js b/public/javascripts/app/models/participation.js index 22d3092104f3da88cce2d2c740032076c48a0632..01c53d9e2be3735a1359a06380752a20321a5ce4 100644 --- a/public/javascripts/app/models/participation.js +++ b/public/javascripts/app/models/participation.js @@ -1 +1 @@ -app.models.Participation = Backbone.Model.extend({ }) +app.models.Participation = Backbone.Model.extend({ }); diff --git a/public/javascripts/app/models/stream.js b/public/javascripts/app/models/stream.js index 39e5e78b718a0b8cc9f4017ec3f7805f1628fa84..a164b04d9e73bacadd5db517b825450ac7fd40dd 100644 --- a/public/javascripts/app/models/stream.js +++ b/public/javascripts/app/models/stream.js @@ -64,4 +64,4 @@ app.models.Stream = Backbone.Collection.extend({ add : function(models){ this.posts.add(models) } -}) +}); diff --git a/public/javascripts/app/pages/post-viewer.js b/public/javascripts/app/pages/post-viewer.js index e43099e138572e06e0cc35df38547e750713177d..f43bf957fc6df10e7a1a83327518d19d11f94486 100644 --- a/public/javascripts/app/pages/post-viewer.js +++ b/public/javascripts/app/pages/post-viewer.js @@ -99,4 +99,4 @@ app.pages.PostViewer = app.views.Base.extend({ this.interactionsView.hidePane(); } -}) +}); diff --git a/public/javascripts/app/views.js b/public/javascripts/app/views.js index 528519a24db08155ce0c8f195b2466006407b592..6ebd412e0b3c71476ff9038f1d2306702819a04b 100644 --- a/public/javascripts/app/views.js +++ b/public/javascripts/app/views.js @@ -62,4 +62,4 @@ app.views.Base = Backbone.View.extend({ removeTooltips : function() { $(".twipsy").remove(); } -}) +}); diff --git a/public/javascripts/app/views/content_view.js b/public/javascripts/app/views/content_view.js index fe2b20a0dc1b506edc968bce6d78c789401c00a2..a7adb609265a534395071a948509a20ed763bbee 100644 --- a/public/javascripts/app/views/content_view.js +++ b/public/javascripts/app/views/content_view.js @@ -29,7 +29,7 @@ app.views.Content = app.views.StreamObject.extend({ if(!photos || photos.length < 2) { return } return photos.slice(1,8) } -}) +}); app.views.StatusMessage = app.views.Content.extend({ templateName : "status-message" diff --git a/public/javascripts/app/views/feedback_view.js b/public/javascripts/app/views/feedback_view.js index d6fe71e1042359bd2a109a18f53c707ce33dfdc2..9046356b3da74a0c2466ec93e5f31897d50c909d 100644 --- a/public/javascripts/app/views/feedback_view.js +++ b/public/javascripts/app/views/feedback_view.js @@ -55,4 +55,4 @@ app.views.Feedback = app.views.Base.extend({ return publicPost && app.currentUser.authenticated() && userIsNotAuthor && userIsNotRootAuthor; } -}) +}); diff --git a/public/javascripts/app/views/post-viewer/author.js b/public/javascripts/app/views/post-viewer/author.js index 4a114217a22d9d2f04e00ce041e21af272ae88cb..0de915c9388eecd476499394c8474e29df9ef449 100644 --- a/public/javascripts/app/views/post-viewer/author.js +++ b/public/javascripts/app/views/post-viewer/author.js @@ -5,5 +5,4 @@ app.views.PostViewerAuthor = app.views.Base.extend({ templateName: "post-viewer/author" -}) - +}); \ No newline at end of file diff --git a/public/javascripts/app/views/post-viewer/feedback.js b/public/javascripts/app/views/post-viewer/feedback.js index 6789c4c962b303953187d841fef38e2380372886..0b38c0588a433e6c79bde1e94d1bf6c10e4faf18 100644 --- a/public/javascripts/app/views/post-viewer/feedback.js +++ b/public/javascripts/app/views/post-viewer/feedback.js @@ -37,4 +37,4 @@ app.views.PostViewerFeedback = app.views.Feedback.extend({ return false; } -}) +}); \ No newline at end of file diff --git a/public/javascripts/app/views/post-viewer/interactions.js b/public/javascripts/app/views/post-viewer/interactions.js index 3fdc3c6363b72b013415408f3f4c39f4750c1a2e..a0b17600b43c18d8477f0886f2923f09ea7a8654 100644 --- a/public/javascripts/app/views/post-viewer/interactions.js +++ b/public/javascripts/app/views/post-viewer/interactions.js @@ -53,4 +53,4 @@ app.views.PostViewerInteractions = app.views.Base.extend({ this.togglePane() } } -}) +}); \ No newline at end of file diff --git a/public/javascripts/app/views/post-viewer/nav.js b/public/javascripts/app/views/post-viewer/nav.js index a85ae2e4051435a46daa1ab990292046dffeda4a..736535d7604d1f308bde2aacad5a0c4733ff03ea 100644 --- a/public/javascripts/app/views/post-viewer/nav.js +++ b/public/javascripts/app/views/post-viewer/nav.js @@ -27,5 +27,4 @@ app.views.PostViewerNav = app.views.Base.extend({ app.router.navigate(link.attr("href").substring(1), true) } -}) - +}); \ No newline at end of file diff --git a/public/javascripts/app/views/post-viewer/new_comment.js b/public/javascripts/app/views/post-viewer/new_comment.js index c42de35c90beaece22ce1f24c50dddcd47f5d473..2ab3b45e7f88ea0be77b5e12682baedbdd354eda 100644 --- a/public/javascripts/app/views/post-viewer/new_comment.js +++ b/public/javascripts/app/views/post-viewer/new_comment.js @@ -42,4 +42,4 @@ app.views.PostViewerNewComment = app.views.Base.extend({ $(this.scrollableArea).scrollTop($(this.scrollableArea).prop("scrollHeight")) } -}) +}); \ No newline at end of file diff --git a/public/javascripts/app/views/post-viewer/reactions.js b/public/javascripts/app/views/post-viewer/reactions.js index 05c685275739b875eb253610e70ca3f8b2b93b4e..145ed1b02a18a59655214de468eef2ecf969e317 100644 --- a/public/javascripts/app/views/post-viewer/reactions.js +++ b/public/javascripts/app/views/post-viewer/reactions.js @@ -31,4 +31,4 @@ app.views.PostViewerReactions = app.views.Base.extend({ }).render().el); } -}) +}); \ No newline at end of file diff --git a/public/javascripts/app/views/stream_faces_view.js b/public/javascripts/app/views/stream_faces_view.js index 9c975105c8909cab2517b59dc28ebb44ec5dbffc..70fa6055b1f8b707a4a90a896f2c5d99b910f01f 100644 --- a/public/javascripts/app/views/stream_faces_view.js +++ b/public/javascripts/app/views/stream_faces_view.js @@ -26,4 +26,4 @@ app.views.StreamFaces = app.views.Base.extend({ this.render(); } -}) +}); \ No newline at end of file