diff --git a/app/assets/javascripts/admin.js.erb b/app/assets/javascripts/admin.js.erb index ce47046a21c..3c536f4ca65 100644 --- a/app/assets/javascripts/admin.js.erb +++ b/app/assets/javascripts/admin.js.erb @@ -1,5 +1,12 @@ <% +if Rails.env.development? + require_asset ("development/list-view.js") +else + require_asset ("production/list-view.js") +end + require_asset("main_include_admin.js") DiscoursePluginRegistry.admin_javascripts.each { |js| require_asset(js) } + %> diff --git a/app/assets/javascripts/discourse/models/category_list.js b/app/assets/javascripts/discourse/models/category_list.js index ee8b08c1583..c0478499d33 100644 --- a/app/assets/javascripts/discourse/models/category_list.js +++ b/app/assets/javascripts/discourse/models/category_list.js @@ -8,7 +8,7 @@ **/ Discourse.CategoryList = Ember.ArrayProxy.extend({ init: function() { - this.set('content', []); + this.content = []; this._super(); } }); diff --git a/app/assets/javascripts/discourse/models/post_stream.js b/app/assets/javascripts/discourse/models/post_stream.js index 583a7939c81..026b84e3cf1 100644 --- a/app/assets/javascripts/discourse/models/post_stream.js +++ b/app/assets/javascripts/discourse/models/post_stream.js @@ -527,7 +527,7 @@ Discourse.PostStream = Em.Object.extend({ this.get('stream').removeObjects(postIds); this.get('posts').removeObjects(posts); postIds.forEach(function(id){ - identityMap.delete(id); + identityMap.remove(id); }); }, diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index b53bc01ef21..37feb1da48e 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -73,7 +73,7 @@ {{loading-spinner condition=postStream.loadingAbove}} {{#unless postStream.loadingFilter}} - {{cloaked-collection itemViewClass="post" + {{cloaked-collection cloakView="post" idProperty="post_number" defaultHeight="200" content=postStream.posts diff --git a/app/assets/javascripts/discourse/views/reply-history.js.es6 b/app/assets/javascripts/discourse/views/reply-history.js.es6 index e1f2cb45bc6..c5f81fa4779 100644 --- a/app/assets/javascripts/discourse/views/reply-history.js.es6 +++ b/app/assets/javascripts/discourse/views/reply-history.js.es6 @@ -1,3 +1,10 @@ +/** + Lists previous posts in the history of a post. + + @class ReplyHistory + @namespace Discourse + @module Discourse +**/ export default Em.CollectionView.extend({ tagName: 'section', classNameBindings: [':embedded-posts', ':top', ':topic-body', ':offset2', 'hidden'], @@ -5,3 +12,5 @@ export default Em.CollectionView.extend({ hidden: Em.computed.equal('content.length', 0), previousPost: true }); + + diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js index 2cd37f1596c..d83be37c142 100644 --- a/app/assets/javascripts/main_include_admin.js +++ b/app/assets/javascripts/main_include_admin.js @@ -1,4 +1,3 @@ -//= require list-view //= require admin/models/user-field //= require admin/controllers/admin-email-skipped //= require admin/controllers/change-site-customization-details diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss index 1eec1d65dc7..656248df673 100644 --- a/app/assets/stylesheets/common/foundation/base.scss +++ b/app/assets/stylesheets/common/foundation/base.scss @@ -92,6 +92,3 @@ pre code { .row:after {clear: both;} -#offscreen-content { - display: none; -} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 111e92e818f..931637e8225 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -61,9 +61,6 @@
-
-
- <% unless current_user %>