Refactor: Move Topic Details into better objects, identity map, tests, query string filters

Author: eviltrout

app/assets/javascripts/admin/controllers/admin_flags_controller.js

@@ -40,6 +40,7 @@ Discourse.AdminFlagsController = Ember.ArrayController.extend({
       bootbox.alert(Em.String.i18n("admin.flags.error"));
     });
   },
+
   /**
     Deletes a post
 

app/assets/javascripts/discourse.js

@@ -331,10 +331,6 @@ Discourse = Ember.Application.createWithMixins({
     Discourse.MessageBus.start();
     Discourse.KeyValueStore.init("discourse_", Discourse.MessageBus);
 
-    // Don't remove site settings for now. It seems on some browsers the route
-    // tries to use it after it has been removed
-    // PreloadStore.remove('siteSettings');
-
     // Developer specific functions
     Discourse.Development.setupProbes();
     Discourse.Development.observeLiveChanges();

app/assets/javascripts/discourse/components/url.js

@@ -5,7 +5,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.URL = {
+Discourse.URL = Em.Object.createWithMixins({
 
   // Used for matching a topic
   TOPIC_REGEXP: /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/,
@@ -23,7 +23,7 @@ Discourse.URL = {
   **/
   router: function() {
     return Discourse.__container__.lookup('router:main');
-  },
+  }.property(),
 
   /**
     Browser aware replaceState. Will only be invoked if the browser supports it.
@@ -43,7 +43,8 @@ Discourse.URL = {
         // while URLs are loading. For example, while a topic loads it sets `currentPost`
         // which triggers a replaceState even though the topic hasn't fully loaded yet!
         Em.run.next(function() {
-          Discourse.URL.router().get('location').replaceURL(path);
+          var location = Discourse.URL.get('router.location');
+          if (location.replaceURL) { location.replaceURL(path); }
         });
     }
   },
@@ -85,10 +86,16 @@ Discourse.URL = {
       if (oldTopicId === newTopicId) {
         Discourse.URL.replaceState(path);
         var topicController = Discourse.__container__.lookup('controller:topic');
-        var opts = { trackVisit: false };
+        var opts = { };
         if (newMatches[3]) opts.nearPost = newMatches[3];
-        topicController.cancelFilter();
-        topicController.loadPosts(opts);
+
+        var postStream = topicController.get('postStream');
+        postStream.refresh(opts).then(function() {
+          topicController.setProperties({
+            currentPost: opts.nearPost || 1,
+            progressPosition: opts.nearPost || 1
+          });
+        });
 
         // Abort routing, we have replaced our state.
         return;
@@ -102,11 +109,18 @@ Discourse.URL = {
 
     // Be wary of looking up the router. In this case, we have links in our
     // HTML, say form compiled markdown posts, that need to be routed.
-    var router = this.router();
+    var router = this.get('router');
     router.router.updateURL(path);
     return router.handleURL(path);
   },
 
+  /**
+    Replaces the query parameters in the URL. Use no parameters to clear them.
+
+    @method replaceQueryParams
+  **/
+  queryParams: Em.computed.alias('router.location.queryParams'),
+
   /**
     @private
 
@@ -131,4 +145,4 @@ Discourse.URL = {
     window.location = Discourse.getURL(url);
   }
 
-};
+});

app/assets/javascripts/discourse/controllers/edit_topic_auto_close_controller.js

@@ -10,15 +10,15 @@
 Discourse.EditTopicAutoCloseController = Discourse.ObjectController.extend(Discourse.ModalFunctionality, {
 
   setDays: function() {
-    if( this.get('auto_close_at') ) {
-      var closeTime = new Date( this.get('auto_close_at') );
+    if( this.get('details.auto_close_at') ) {
+      var closeTime = new Date( this.get('details.auto_close_at') );
       if (closeTime > new Date()) {
         this.set('auto_close_days', closeTime.daysSince());
       }
     } else {
-      this.set('auto_close_days', '');
+      this.set('details.auto_close_days', '');
     }
-  }.observes('auto_close_at'),
+  }.observes('details.auto_close_at'),
 
   saveAutoClose: function() {
     this.setAutoClose( parseFloat(this.get('auto_close_days')) );
@@ -36,7 +36,7 @@ Discourse.EditTopicAutoCloseController = Discourse.ObjectController.extend(Disco
       dataType: 'html', // no custom errors, jquery 1.9 enforces json
       data: { auto_close_days: days > 0 ? days : null }
     }).then(function(){
-      editTopicAutoCloseController.set('auto_close_at', moment().add('days', days).format());
+      editTopicAutoCloseController.set('details.auto_close_at', moment().add('days', days).format());
     }, function (error) {
       bootbox.alert(Em.String.i18n('generic_error'));
     });

app/assets/javascripts/discourse/controllers/invite_private_controller.js

@@ -40,7 +40,7 @@ Discourse.InvitePrivateController = Discourse.ObjectController.extend(Discourse.
       invitePrivateController.set('finished', true);
 
       if(result && result.user) {
-        invitePrivateController.get('content.allowed_users').pushObject(result.user);
+        invitePrivateController.get('content.details.allowed_users').pushObject(result.user);
       }
     }, function() {
       // Failure

app/assets/javascripts/discourse/controllers/quote_button_controller.js

@@ -34,7 +34,7 @@ Discourse.QuoteButtonController = Discourse.Controller.extend({
     if (!Discourse.User.current()) return;
 
     // don't display the "quote-reply" button if we can't create a post
-    if (!this.get('controllers.topic.content.can_create_post')) return;
+    if (!this.get('controllers.topic.model.details.can_create_post')) return;
 
     var selection = window.getSelection();
     // no selections