Big commit:

- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises

Author: eviltrout

Gemfile.lock

@@ -456,7 +456,7 @@ GEM
     turbo-sprockets-rails3 (0.3.6)
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.0.0)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)

app/assets/javascripts/admin/models/admin_user.js

@@ -156,15 +156,9 @@ Discourse.AdminUser.reopenClass({
   },
 
   find: function(username) {
-    var promise;
-    promise = new RSVP.Promise();
-    $.ajax({
-      url: "/admin/users/" + username,
-      success: function(result) {
-        return promise.resolve(Discourse.AdminUser.create(result));
-      }
-    });
-    return promise;
+    return $.ajax({url: "/admin/users/" + username}).then(function (result) {
+      return Discourse.AdminUser.create(result);
+    })
   },
 
   findAll: function(query, filter) {

app/assets/javascripts/admin/models/flagged_post.js

@@ -46,47 +46,15 @@ Discourse.FlaggedPost = Discourse.Post.extend({
   }).property('topic_hidden'),
 
   deletePost: function() {
-    var promise;
-    promise = new RSVP.Promise();
     if (this.get('post_number') === "1") {
-      return $.ajax("/t/" + this.topic_id, {
-        type: 'DELETE',
-        cache: false,
-        success: function() {
-          promise.resolve();
-        },
-        error: function(e) {
-          promise.reject();
-        }
-      });
+      return $.ajax("/t/" + this.topic_id, { type: 'DELETE', cache: false });
     } else {
-      return $.ajax("/posts/" + this.id, {
-        type: 'DELETE',
-        cache: false,
-        success: function() {
-          promise.resolve();
-        },
-        error: function(e) {
-          promise.reject();
-        }
-      });
+      return $.ajax("/posts/" + this.id, { type: 'DELETE', cache: false });
     }
   },
 
   clearFlags: function() {
-    var promise;
-    promise = new RSVP.Promise();
-    $.ajax("/admin/flags/clear/" + this.id, {
-      type: 'POST',
-      cache: false,
-      success: function() {
-        promise.resolve();
-      },
-      error: function(e) {
-        promise.reject();
-      }
-    });
-    return promise;
+    return $.ajax("/admin/flags/clear/" + this.id, { type: 'POST', cache: false });
   },
 
   hiddenClass: (function() {

app/assets/javascripts/admin/models/version_check.js

@@ -26,14 +26,8 @@ Discourse.VersionCheck = Discourse.Model.extend({
 
 Discourse.VersionCheck.reopenClass({
   find: function() {
-    var promise = new RSVP.Promise();
-    $.ajax({
-      url: '/admin/version_check',
-      dataType: 'json',
-      success: function(json) {
-        promise.resolve(Discourse.VersionCheck.create(json));
-      }
+    return $.ajax({ url: '/admin/version_check', dataType: 'json' }).then(function(json) {
+      return Discourse.VersionCheck.create(json);
     });
-    return promise;
   }
 });

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

@@ -8,22 +8,20 @@
 **/
 Discourse.ComposerController = Discourse.Controller.extend({
   needs: ['modal', 'topic'],
-  hasReply: false,
 
   togglePreview: function() {
-    return this.get('content').togglePreview();
+    this.get('content').togglePreview();
   },
 
   // Import a quote from the post
   importQuote: function() {
-    return this.get('content').importQuote();
+    this.get('content').importQuote();
   },
 
   appendText: function(text) {
-    var c;
-    c = this.get('content');
+    var c = this.get('content');
     if (c) {
-      return c.appendText(text);
+      c.appendText(text);
     }
   },
 
@@ -72,11 +70,10 @@ Discourse.ComposerController = Discourse.Controller.extend({
         }
 
         bootbox.dialog(message, buttons);
-
         return;
       }
     }
-    
+
     return composer.save({
       imageSizes: this.get('view').imageSizes()
     }).then(function(opts) {
@@ -94,17 +91,80 @@ Discourse.ComposerController = Discourse.Controller.extend({
     });
   },
 
-  checkReplyLength: function() {
-    if (this.present('content.reply')) {
-      this.set('hasReply', true);
-    } else {
-      this.set('hasReply', false);
+  closeEducation: function() {
+    this.set('educationClosed', true);
+  },
+
+  closeSimilar: function() {
+    this.set('similarClosed', true);
+  },
+
+  similarVisible: function() {
+    if (this.get('similarClosed')) return false;
+    if (this.get('content.composeState') !== Discourse.Composer.OPEN) return false;
+    return (this.get('similarTopics.length') || 0) > 0;
+  }.property('similarTopics.length', 'similarClosed', 'content.composeState'),
+
+  newUserEducationVisible: function() {
+    if (!this.get('educationContents')) return false;
+    if (this.get('content.composeState') !== Discourse.Composer.OPEN) return false;
+    if (!this.present('content.reply')) return false;
+    if (this.get('educationClosed')) return false;
+    return true;
+  }.property('content.composeState', 'content.reply', 'educationClosed', 'educationContents'),
+
+  fetchNewUserEducation: function() {
+    // If creating a topic, use topic_count, otherwise post_count
+    var count = this.get('content.creatingTopic') ? Discourse.get('currentUser.topic_count') : Discourse.get('currentUser.reply_count');
+    if (count >= Discourse.SiteSettings.educate_until_posts) {
+      this.set('educationClosed', true);
+      this.set('educationContents', '');
+      return;
     }
+
+    // The user must have typed a reply
+    if (!this.get('typedReply')) return;
+
+    this.set('educationClosed', false);
+
+    // If visible update the text
+    var educationKey = this.get('content.creatingTopic') ? 'new-topic' : 'new-reply';
+    var composerController = this;
+    $.get("/education/" + educationKey).then(function(result) {
+      composerController.set('educationContents', result);
+    });
+  }.observes('typedReply', 'content.creatingTopic', 'Discourse.currentUser.reply_count'),
+
+  checkReplyLength: function() {
+    this.set('typedReply', this.present('content.reply'));
+  },
+
+  /**
+    Fired after a user stops typing. Considers whether to check for similar
+    topics based on the current composer state.
+
+    @method findSimilarTopics
+  **/
+  findSimilarTopics: function() {
+
+    // We don't care about similar topics unless creating a topic
+    if (!this.get('content.creatingTopic')) return;
+
+    var body = this.get('content.reply');
+    var title = this.get('content.title');
+
+    // Ensure the fields are of the minimum length
+    if (body.length < Discourse.SiteSettings.min_body_similar_length) return;
+    if (title.length < Discourse.SiteSettings.min_title_similar_length) return;
+
+    var composerController = this;
+    Discourse.Topic.findSimilarTo(title, body).then(function (topics) {
+      composerController.set('similarTopics', topics);
+    });
   },
 
   saveDraft: function() {
-    var model;
-    model = this.get('content');
+    var model = this.get('content');
     if (model) model.saveDraft();
   },
 
@@ -123,8 +183,11 @@ Discourse.ComposerController = Discourse.Controller.extend({
       _this = this;
     if (!opts) opts = {};
 
-    opts.promise = promise = opts.promise || new RSVP.Promise();
-    this.set('hasReply', false);
+    opts.promise = promise = opts.promise || Ember.Deferred.create();
+    this.set('typedReply', false);
+    this.set('similarTopics', null);
+    this.set('similarClosed', false);
+
     if (!opts.draftKey) {
       alert("composer was opened without a draft key");
       throw "composer opened without a proper draft key";
@@ -133,9 +196,7 @@ Discourse.ComposerController = Discourse.Controller.extend({
     // ensure we have a view now, without it transitions are going to be messed
     view = this.get('view');
     if (!view) {
-      view = Discourse.ComposerView.create({
-        controller: this
-      });
+      view = Discourse.ComposerView.create({ controller: this });
       view.appendTo($('#main'));
       this.set('view', view);
       // the next runloop is too soon, need to get the control rendered and then
@@ -197,8 +258,7 @@ Discourse.ComposerController = Discourse.Controller.extend({
   },
 
   wouldLoseChanges: function() {
-    var composer;
-    composer = this.get('content');
+    var composer = this.get('content');
     return composer && composer.wouldLoseChanges();
   },
 
@@ -210,10 +270,9 @@ Discourse.ComposerController = Discourse.Controller.extend({
   },
 
   destroyDraft: function() {
-    var key;
-    key = this.get('content.draftKey');
+    var key = this.get('content.draftKey');
     if (key) {
-      return Discourse.Draft.clear(key, this.get('content.draftSequence'));
+      Discourse.Draft.clear(key, this.get('content.draftSequence'));
     }
   },
 
@@ -243,17 +302,17 @@ Discourse.ComposerController = Discourse.Controller.extend({
     }
   },
 
-  click: function() {
+  openIfDraft: function() {
     if (this.get('content.composeState') === Discourse.Composer.DRAFT) {
-      return this.set('content.composeState', Discourse.Composer.OPEN);
+      this.set('content.composeState', Discourse.Composer.OPEN);
     }
   },
 
   shrink: function() {
     if (this.get('content.reply') === this.get('content.originalText')) {
-      return this.close();
+      this.close();
     } else {
-      return this.collapse();
+      this.collapse();
     }
   },
 

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

@@ -42,27 +42,23 @@ Discourse.ListController = Discourse.Controller.extend({
     this.set('loading', true);
 
     if (filterMode === 'categories') {
-      return Ember.Deferred.promise(function(deferred) {
-        Discourse.CategoryList.list(filterMode).then(function(items) {
-          listController.set('loading', false);
-          listController.set('filterMode', filterMode);
-          listController.set('categoryMode', true);
-          return deferred.resolve(items);
-        });
+      return Discourse.CategoryList.list(filterMode).then(function(items) {
+        listController.set('loading', false);
+        listController.set('filterMode', filterMode);
+        listController.set('categoryMode', true);
+        return items;
       });
     }
 
     var current = (this.get('availableNavItems').filter(function(f) { return f.name === filterMode; }))[0];
     if (!current) {
       current = Discourse.NavItem.create({ name: filterMode });
     }
-    return Ember.Deferred.promise(function(deferred) {
-      Discourse.TopicList.list(current).then(function(items) {
-        listController.set('filterSummary', items.filter_summary);
-        listController.set('filterMode', filterMode);
-        listController.set('loading', false);
-        return deferred.resolve(items);
-      });
+    return Discourse.TopicList.list(current).then(function(items) {
+      listController.set('filterSummary', items.filter_summary);
+      listController.set('filterMode', filterMode);
+      listController.set('loading', false);
+      return items;
     });
   },
 

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

@@ -117,19 +117,18 @@ Discourse.TopicController = Discourse.ObjectController.extend({
   },
 
   replyAsNewTopic: function(post) {
-    var composerController, postLink, postUrl, promise;
-    composerController = this.get('controllers.composer');
-
     // TODO shut down topic draft cleanly if it exists ...
-    promise = composerController.open({
+    var composerController = this.get('controllers.composer');
+    var promise = composerController.open({
       action: Discourse.Composer.CREATE_TOPIC,
       draftKey: Discourse.Composer.REPLY_AS_NEW_TOPIC_KEY
     });
-    postUrl = "" + location.protocol + "//" + location.host + (post.get('url'));
-    postLink = "[" + (this.get('title')) + "](" + postUrl + ")";
-    return promise.then(function() {
-      return Discourse.Post.loadQuote(post.get('id')).then(function(q) {
-        return composerController.appendText("" + (Em.String.i18n("post.continue_discussion", {
+    var postUrl = "" + location.protocol + "//" + location.host + (post.get('url'));
+    var postLink = "[" + (this.get('title')) + "](" + postUrl + ")";
+
+    promise.then(function() {
+      Discourse.Post.loadQuote(post.get('id')).then(function(q) {
+        composerController.appendText("" + (Em.String.i18n("post.continue_discussion", {
           postLink: postLink
         })) + "\n\n" + q);
       });