From e461c842537b5c48e6f99fa658236948b850276b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 22 Feb 2013 15:41:12 -0500 Subject: [PATCH] Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline --- .../controllers/admin_customize_controller.js | 102 +- .../controllers/admin_dashboard_controller.js | 26 +- .../admin_email_logs_controller.js | 76 +- .../controllers/admin_flags_controller.js | 108 +- .../admin_site_settings_controller.js | 120 +- .../admin_users_list_controller.js | 198 ++-- .../javascripts/admin/models/admin_user.js | 336 +++--- .../javascripts/admin/models/email_log.js | 64 +- .../javascripts/admin/models/flagged_post.js | 210 ++-- .../admin/models/site_customization.js | 213 ++-- .../javascripts/admin/models/site_setting.js | 110 +- .../javascripts/admin/models/version_check.js | 66 +- .../admin/routes/admin_customize_route.js | 32 +- .../admin/routes/admin_dashboard_route.js | 57 +- .../admin/routes/admin_email_logs_route.js | 32 +- .../admin/routes/admin_flags_active_route.js | 36 +- .../admin/routes/admin_flags_old_route.js | 38 +- .../admin/routes/admin_flags_route.js | 26 +- .../javascripts/admin/routes/admin_route.js | 26 +- .../javascripts/admin/routes/admin_routes.js | 53 +- .../admin/routes/admin_site_settings_route.js | 32 +- .../admin/routes/admin_user_route.js | 32 +- .../routes/admin_users_list_active_route.js | 26 +- .../routes/admin_users_list_new_route.js | 26 +- .../routes/admin_users_list_pending_route.js | 26 +- .../admin/routes/admin_users_list_route.js | 26 +- .../admin/views/ace_editor_view.js | 119 +- .../admin/views/admin_customize_view.js | 79 +- .../admin/views/admin_dashboard_view.js | 54 +- app/assets/javascripts/application.js.erb | 1 + app/assets/javascripts/discourse.js | 717 ++++++----- .../discourse/components/autocomplete.js | 596 +++++----- .../discourse/components/bbcode.js | 393 +++--- .../discourse/components/caret_position.js | 253 ++-- .../discourse/components/click_track.js | 187 ++- .../discourse/components/debounce.js | 14 +- .../components/discourse_text_field.js | 10 - .../discourse/components/div_resizer.js | 167 ++- .../discourse/components/eyeline.js | 188 ++- .../discourse/components/key_value_store.js | 91 +- .../discourse/components/lightbox.js | 36 +- .../discourse/components/mention.js | 59 + .../discourse/components/message_bus.js | 286 +++-- .../discourse/components/onebox.js | 89 ++ .../discourse/components/pagedown_editor.js | 38 - .../discourse/components/probes.js | 41 +- .../discourse/components/sanitize.js | 92 -- .../discourse/components/screen_track.js | 310 +++-- .../components/syntax_highlighting.js | 36 +- .../discourse/components/transition_helper.js | 70 +- .../discourse/components/user_search.js | 137 +-- .../discourse/components/utilities.js | 487 ++++---- .../controllers/application_controller.js | 13 +- .../controllers/composer_controller.js | 500 ++++---- .../discourse/controllers/controller.js | 13 +- .../controllers/header_controller.js | 32 +- .../controllers/list_categories_controller.js | 73 +- .../discourse/controllers/list_controller.js | 188 +-- .../controllers/list_topics_controller.js | 136 +-- .../discourse/controllers/modal_controller.js | 20 +- .../controllers/object_controller.js | 12 + .../controllers/preferences_controller.js | 235 ++-- .../preferences_email_controller.js | 94 +- .../preferences_username_controller.js | 133 +-- .../controllers/quote_button_controller.js | 164 +-- .../discourse/controllers/share_controller.js | 54 +- .../controllers/static_controller.js | 60 +- .../topic_admin_menu_controller.js | 29 +- .../discourse/controllers/topic_controller.js | 785 ++++++------ .../controllers/user_activity_controller.js | 42 +- .../discourse/controllers/user_controller.js | 29 +- .../controllers/user_invited_controller.js | 22 +- .../user_private_messages_controller.js | 39 +- .../discourse/helpers/application_helpers.js | 414 ++++--- .../discourse/helpers/i18n_helpers.js | 93 +- .../javascripts/discourse/mixins/presence.js | 82 +- .../javascripts/discourse/mixins/scrolling.js | 55 +- .../discourse/models/action_summary.js | 234 ++-- .../javascripts/discourse/models/archetype.js | 33 +- .../javascripts/discourse/models/category.js | 94 +- .../discourse/models/category_list.js | 85 +- .../javascripts/discourse/models/composer.js | 1050 ++++++++--------- .../javascripts/discourse/models/draft.js | 146 ++- .../discourse/models/input_validation.js | 12 +- .../javascripts/discourse/models/invite.js | 53 +- .../discourse/models/invite_list.js | 72 +- .../javascripts/discourse/models/mention.js | 54 - .../javascripts/discourse/models/model.js | 136 ++- .../javascripts/discourse/models/nav_item.js | 128 +- .../discourse/models/notification.js | 77 +- .../javascripts/discourse/models/onebox.js | 83 -- .../javascripts/discourse/models/post.js | 683 +++++------ .../discourse/models/post_action_type.js | 35 +- .../javascripts/discourse/models/site.js | 114 +- .../javascripts/discourse/models/topic.js | 828 +++++++------ .../discourse/models/topic_list.js | 237 ++-- .../javascripts/discourse/models/user.js | 621 +++++----- .../discourse/models/user_action.js | 275 ++--- .../discourse/models/user_action_group.js | 24 +- .../discourse/models/user_action_stat.js | 12 +- .../discourse/routes/application_route.js | 28 +- .../discourse/routes/application_routes.js | 96 +- .../discourse/routes/discourse_location.js | 11 +- .../routes/discourse_restricted_user_route.js | 34 +- .../discourse/routes/discourse_route.js | 46 +- .../discourse/routes/filtered_list_route.js | 81 +- .../discourse/routes/list_categories_route.js | 55 +- .../discourse/routes/list_category_route.js | 59 +- .../routes/preferences_email_route.js | 32 +- .../discourse/routes/preferences_route.js | 37 +- .../routes/preferences_username_route.js | 37 +- .../discourse/routes/static_route.js | 30 +- .../discourse/routes/topic_best_of_route.js | 36 +- .../routes/topic_from_params_route.js | 32 +- .../discourse/routes/topic_route.js | 71 +- .../discourse/routes/user_activity_route.js | 37 +- .../discourse/routes/user_invited_route.js | 37 +- .../routes/user_private_messages_route.js | 58 +- .../discourse/routes/user_route.js | 32 +- .../templates/embedded_post.js.handlebars | 2 +- .../discourse/templates/post.js.handlebars | 12 +- .../templates/suggested_topic.js.handlebars | 16 +- .../discourse/views/actions_history_view.js | 155 +-- .../discourse/views/application_view.js | 16 +- .../views/archetype_options_modal_view.js | 8 - .../discourse/views/auto_sized_text_view.js | 24 - .../discourse/views/button_view.js | 46 +- .../discourse/views/combobox_view.js | 87 +- .../discourse/views/combobox_view_category.js | 30 +- .../discourse/views/composer_view.js | 728 ++++++------ .../discourse/views/discourse_text_field.js | 18 + .../discourse/views/dropdown_button_view.js | 98 +- .../discourse/views/embedded_post_view.js | 29 +- .../views/excerpt/excerpt_category_view.js | 44 - .../views/excerpt/excerpt_post_view.js | 30 - .../views/excerpt/excerpt_user_view.js | 26 - .../discourse/views/excerpt/excerpt_view.js | 185 --- .../discourse/views/featured_threads_view.js | 12 - .../discourse/views/featured_topics_view.js | 18 +- .../javascripts/discourse/views/flag_view.js | 83 -- .../discourse/views/header_view.js | 231 ++-- .../discourse/views/history_view.js | 42 - .../discourse/views/image_selector.js | 32 - .../discourse/views/input_tip_view.js | 52 +- .../views/list/list_categories_view.js | 25 +- .../discourse/views/list/list_topics_view.js | 195 +-- .../discourse/views/list/list_view.js | 53 +- .../views/list/topic_list_item_view.js | 79 +- .../modal/archetype_options_modal_view.js | 14 + .../views/modal/archetype_options_view.js | 50 +- .../views/modal/create_account_view.js | 524 ++++---- .../views/modal/edit_category_view.js | 124 +- .../discourse/views/modal/flag_view.js | 84 ++ .../views/modal/forgot_password_view.js | 45 +- .../discourse/views/modal/history_view.js | 52 + .../discourse/views/modal/image_selector.js | 42 + .../views/modal/invite_modal_view.js | 113 +- .../views/modal/invite_private_modal_view.js | 96 +- .../discourse/views/modal/login_view.js | 270 ++--- .../discourse/views/modal/modal_body_view.js | 57 +- .../discourse/views/modal/modal_view.js | 69 +- .../views/modal/move_selected_view.js | 96 +- .../views/modal/not_activated_view.js | 9 +- .../views/modal/option_boolean_view.js | 43 +- .../discourse/views/nav_item_view.js | 106 +- .../discourse/views/notifications_view.js | 18 +- .../discourse/views/pagedown_editor.js | 45 + .../discourse/views/parent_view.js | 42 +- .../discourse/views/participant_view.js | 24 +- .../discourse/views/post_link_view.js | 48 +- .../discourse/views/post_menu_view.js | 341 +++--- .../javascripts/discourse/views/post_view.js | 576 +++++---- .../discourse/views/prepend_post_view.js | 22 +- .../discourse/views/quote_buton_view.js | 78 +- .../discourse/views/replies_view.js | 50 +- .../views/search/search_results_type_view.js | 47 +- .../discourse/views/search/search_view.js | 285 ++--- .../discourse/views/selected_posts_view.js | 32 +- .../javascripts/discourse/views/share_view.js | 109 +- .../discourse/views/suggested_topic_view.js | 16 +- .../discourse/views/topic_admin_menu_view.js | 43 +- .../discourse/views/topic_extra_info_view.js | 36 +- .../views/topic_footer_buttons_view.js | 270 +++-- .../discourse/views/topic_posts_view.js | 22 +- .../discourse/views/topic_status_view.js | 90 +- .../views/topic_summary/topic_links_view.js | 7 - .../views/topic_summary/topic_summary_view.js | 163 ++- .../javascripts/discourse/views/topic_view.js | 965 ++++++++------- .../views/user/activity_filter_view.js | 65 +- .../views/user/preferences_email_view.js | 24 +- .../views/user/preferences_username_view.js | 43 +- .../discourse/views/user/preferences_view.js | 18 +- .../views/user/user_activity_view.js | 28 +- .../discourse/views/user/user_invited_view.js | 16 +- .../views/user/user_private_messages_view.js | 48 +- .../discourse/views/user/user_stream_view.js | 95 +- .../discourse/views/user/user_view.js | 34 +- .../javascripts/discourse/views/view.js | 10 +- app/assets/javascripts/env.js | 4 +- app/assets/javascripts/pagedown_custom.js | 4 +- app/assets/javascripts/preload_store.js | 99 +- .../stylesheets/components/tooltips.css.scss | 144 --- config/initializers/discourse_iife.rb | 3 + config/jshint.yml | 1 + lib/discourse_iife.rb | 22 + lib/oneboxer/discourse_onebox.rb | 15 +- spec/fixtures/oneboxer/android.response | 4 +- spec/javascripts/bbcode_spec.js | 4 +- spec/javascripts/hacks.js | 4 +- spec/javascripts/key_value_store_spec.js | 4 +- spec/javascripts/message_bus_spec.js | 4 +- spec/javascripts/onebox_spec.js | 4 +- spec/javascripts/preload_store_spec.js | 4 +- spec/javascripts/user_action_spec.js | 4 +- spec/javascripts/utilities_spec.js | 4 +- spec/phantom_js/smoke_test.js | 18 +- sublime-project | 2 +- 217 files changed, 11996 insertions(+), 12131 deletions(-) delete mode 100644 app/assets/javascripts/discourse/components/discourse_text_field.js create mode 100644 app/assets/javascripts/discourse/components/mention.js create mode 100644 app/assets/javascripts/discourse/components/onebox.js delete mode 100644 app/assets/javascripts/discourse/components/pagedown_editor.js delete mode 100644 app/assets/javascripts/discourse/components/sanitize.js create mode 100644 app/assets/javascripts/discourse/controllers/object_controller.js delete mode 100644 app/assets/javascripts/discourse/models/mention.js delete mode 100644 app/assets/javascripts/discourse/models/onebox.js delete mode 100644 app/assets/javascripts/discourse/views/archetype_options_modal_view.js delete mode 100644 app/assets/javascripts/discourse/views/auto_sized_text_view.js create mode 100644 app/assets/javascripts/discourse/views/discourse_text_field.js delete mode 100644 app/assets/javascripts/discourse/views/excerpt/excerpt_category_view.js delete mode 100644 app/assets/javascripts/discourse/views/excerpt/excerpt_post_view.js delete mode 100644 app/assets/javascripts/discourse/views/excerpt/excerpt_user_view.js delete mode 100644 app/assets/javascripts/discourse/views/excerpt/excerpt_view.js delete mode 100644 app/assets/javascripts/discourse/views/featured_threads_view.js delete mode 100644 app/assets/javascripts/discourse/views/flag_view.js delete mode 100644 app/assets/javascripts/discourse/views/history_view.js delete mode 100644 app/assets/javascripts/discourse/views/image_selector.js create mode 100644 app/assets/javascripts/discourse/views/modal/archetype_options_modal_view.js create mode 100644 app/assets/javascripts/discourse/views/modal/flag_view.js create mode 100644 app/assets/javascripts/discourse/views/modal/history_view.js create mode 100644 app/assets/javascripts/discourse/views/modal/image_selector.js create mode 100644 app/assets/javascripts/discourse/views/pagedown_editor.js delete mode 100644 app/assets/javascripts/discourse/views/topic_summary/topic_links_view.js delete mode 100644 app/assets/stylesheets/components/tooltips.css.scss create mode 100644 config/initializers/discourse_iife.rb create mode 100644 lib/discourse_iife.rb diff --git a/app/assets/javascripts/admin/controllers/admin_customize_controller.js b/app/assets/javascripts/admin/controllers/admin_customize_controller.js index dfa0fb9054b..ca5ad7f731f 100644 --- a/app/assets/javascripts/admin/controllers/admin_customize_controller.js +++ b/app/assets/javascripts/admin/controllers/admin_customize_controller.js @@ -1,63 +1,59 @@ -(function() { +/** + This controller supports interface for creating custom CSS skins in Discourse. + + @class AdminCustomizeController + @extends Ember.Controller + @namespace Discourse + @module Discourse +**/ +Discourse.AdminCustomizeController = Ember.Controller.extend({ /** - This controller supports interface for creating custom CSS skins in Discourse. + Create a new customization style - @class AdminCustomizeController - @extends Ember.Controller - @namespace Discourse - @module Discourse - **/ - window.Discourse.AdminCustomizeController = Ember.Controller.extend({ + @method newCustomization + **/ + newCustomization: function() { + var item = Discourse.SiteCustomization.create({name: 'New Style'}); + this.get('content').pushObject(item); + this.set('content.selectedItem', item); + }, - /** - Create a new customization style + /** + Select a given style - @method newCustomization - **/ - newCustomization: function() { - var item = Discourse.SiteCustomization.create({name: 'New Style'}); - this.get('content').pushObject(item); - this.set('content.selectedItem', item); - }, + @method selectStyle + @param {Discourse.SiteCustomization} style The style we are selecting + **/ + selectStyle: function(style) { + this.set('content.selectedItem', style); + }, - /** - Select a given style + /** + Save the current customization - @method selectStyle - @param {Discourse.SiteCustomization} style The style we are selecting - **/ - selectStyle: function(style) { - this.set('content.selectedItem', style); - }, + @method save + **/ + save: function() { + this.get('content.selectedItem').save(); + }, - /** - Save the current customization + /** + Destroy the current customization - @method save - **/ - save: function() { - this.get('content.selectedItem').save(); - }, + @method destroy + **/ + destroy: function() { + var _this = this; + return bootbox.confirm(Em.String.i18n("admin.customize.delete_confirm"), Em.String.i18n("no_value"), Em.String.i18n("yes_value"), function(result) { + var selected; + if (result) { + selected = _this.get('content.selectedItem'); + selected["delete"](); + _this.set('content.selectedItem', null); + return _this.get('content').removeObject(selected); + } + }); + } - /** - Destroy the current customization - - @method destroy - **/ - destroy: function() { - var _this = this; - return bootbox.confirm(Em.String.i18n("admin.customize.delete_confirm"), Em.String.i18n("no_value"), Em.String.i18n("yes_value"), function(result) { - var selected; - if (result) { - selected = _this.get('content.selectedItem'); - selected["delete"](); - _this.set('content.selectedItem', null); - return _this.get('content').removeObject(selected); - } - }); - } - - }); - -}).call(this); +}); diff --git a/app/assets/javascripts/admin/controllers/admin_dashboard_controller.js b/app/assets/javascripts/admin/controllers/admin_dashboard_controller.js index 5c00923dcb9..8ec0442a3ba 100644 --- a/app/assets/javascripts/admin/controllers/admin_dashboard_controller.js +++ b/app/assets/javascripts/admin/controllers/admin_dashboard_controller.js @@ -1,16 +1,12 @@ -(function() { +/** + This controller supports the default interface when you enter the admin section. - /** - This controller supports the default interface when you enter the admin section. - - @class AdminDashboardController - @extends Ember.Controller - @namespace Discourse - @module Discourse - **/ - window.Discourse.AdminDashboardController = Ember.Controller.extend({ - loading: true, - versionCheck: null - }); - -}).call(this); + @class AdminDashboardController + @extends Ember.Controller + @namespace Discourse + @module Discourse +**/ +Discourse.AdminDashboardController = Ember.Controller.extend({ + loading: true, + versionCheck: null +}); diff --git a/app/assets/javascripts/admin/controllers/admin_email_logs_controller.js b/app/assets/javascripts/admin/controllers/admin_email_logs_controller.js index fbe31fed562..ef088cbaa23 100644 --- a/app/assets/javascripts/admin/controllers/admin_email_logs_controller.js +++ b/app/assets/javascripts/admin/controllers/admin_email_logs_controller.js @@ -1,43 +1,39 @@ -(function() { +/** + This controller supports the interface for reviewing email logs. + + @class AdminEmailLogsController + @extends Ember.ArrayController + @namespace Discourse + @module Discourse +**/ +Discourse.AdminEmailLogsController = Ember.ArrayController.extend(Discourse.Presence, { + + /** + Is the "send test email" button disabled? + + @property sendTestEmailDisabled + **/ + sendTestEmailDisabled: (function() { + return this.blank('testEmailAddress'); + }).property('testEmailAddress'), /** - This controller supports the interface for reviewing email logs. + Sends a test email to the currently entered email address - @class AdminEmailLogsController - @extends Ember.ArrayController - @namespace Discourse - @module Discourse - **/ - window.Discourse.AdminEmailLogsController = Ember.ArrayController.extend(Discourse.Presence, { - - /** - Is the "send test email" button disabled? - - @property sendTestEmailDisabled - **/ - sendTestEmailDisabled: (function() { - return this.blank('testEmailAddress'); - }).property('testEmailAddress'), - - /** - Sends a test email to the currently entered email address - - @method sendTestEmail - **/ - sendTestEmail: function() { - var _this = this; - _this.set('sentTestEmail', false); - jQuery.ajax({ - url: '/admin/email_logs/test', - type: 'POST', - data: { email_address: this.get('testEmailAddress') }, - success: function() { - return _this.set('sentTestEmail', true); - } - }); - return false; - } - - }); - -}).call(this); + @method sendTestEmail + **/ + sendTestEmail: function() { + var _this = this; + _this.set('sentTestEmail', false); + jQuery.ajax({ + url: '/admin/email_logs/test', + type: 'POST', + data: { email_address: this.get('testEmailAddress') }, + success: function() { + return _this.set('sentTestEmail', true); + } + }); + return false; + } + +}); diff --git a/app/assets/javascripts/admin/controllers/admin_flags_controller.js b/app/assets/javascripts/admin/controllers/admin_flags_controller.js index a3a6107ed3f..8663e347329 100644 --- a/app/assets/javascripts/admin/controllers/admin_flags_controller.js +++ b/app/assets/javascripts/admin/controllers/admin_flags_controller.js @@ -1,63 +1,59 @@ -(function() { +/** + This controller supports the interface for dealing with flags in the admin section. + + @class AdminFlagsController + @extends Ember.Controller + @namespace Discourse + @module Discourse +**/ +Discourse.AdminFlagsController = Ember.Controller.extend({ + + /** + Clear all flags on a post + + @method clearFlags + @param {Discourse.FlaggedPost} item The post whose flags we want to clear + **/ + clearFlags: function(item) { + var _this = this; + item.clearFlags().then((function() { + _this.content.removeObject(item); + }), (function() { + bootbox.alert("something went wrong"); + })); + }, /** - This controller supports the interface for dealing with flags in the admin section. + Deletes a post - @class AdminFlagsController - @extends Ember.Controller - @namespace Discourse - @module Discourse - **/ - window.Discourse.AdminFlagsController = Ember.Controller.extend({ - - /** - Clear all flags on a post + @method deletePost + @param {Discourse.FlaggedPost} item The post to delete + **/ + deletePost: function(item) { + var _this = this; + item.deletePost().then((function() { + _this.content.removeObject(item); + }), (function() { + bootbox.alert("something went wrong"); + })); + }, - @method clearFlags - @param {Discourse.FlaggedPost} item The post whose flags we want to clear - **/ - clearFlags: function(item) { - var _this = this; - item.clearFlags().then((function() { - _this.content.removeObject(item); - }), (function() { - bootbox.alert("something went wrong"); - })); - }, + /** + Are we viewing the 'old' view? - /** - Deletes a post + @property adminOldFlagsView + **/ + adminOldFlagsView: (function() { + return this.query === 'old'; + }).property('query'), - @method deletePost - @param {Discourse.FlaggedPost} item The post to delete - **/ - deletePost: function(item) { - var _this = this; - item.deletePost().then((function() { - _this.content.removeObject(item); - }), (function() { - bootbox.alert("something went wrong"); - })); - }, + /** + Are we viewing the 'active' view? - /** - Are we viewing the 'old' view? - - @property adminOldFlagsView - **/ - adminOldFlagsView: (function() { - return this.query === 'old'; - }).property('query'), - - /** - Are we viewing the 'active' view? - - @property adminActiveFlagsView - **/ - adminActiveFlagsView: (function() { - return this.query === 'active'; - }).property('query') - - }); - -}).call(this); + @property adminActiveFlagsView + **/ + adminActiveFlagsView: (function() { + return this.query === 'active'; + }).property('query') + +}); diff --git a/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js b/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js index da618df7895..3891f72aa8e 100644 --- a/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js +++ b/app/assets/javascripts/admin/controllers/admin_site_settings_controller.js @@ -1,74 +1,70 @@ -(function() { +/** + This controller supports the interface for SiteSettings. + + @class AdminSiteSettingsController + @extends Ember.ArrayController + @namespace Discourse + @module Discourse +**/ +Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.Presence, { + filter: null, + onlyOverridden: false, /** - This controller supports the interface for SiteSettings. + The list of settings based on the current filters - @class AdminSiteSettingsController - @extends Ember.ArrayController - @namespace Discourse - @module Discourse - **/ - window.Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.Presence, { - filter: null, - onlyOverridden: false, + @property filteredContent + **/ + filteredContent: (function() { + var filter, + _this = this; + if (!this.present('content')) return null; + if (this.get('filter')) { + filter = this.get('filter').toLowerCase(); + } - /** - The list of settings based on the current filters - - @property filteredContent - **/ - filteredContent: (function() { - var filter, - _this = this; - if (!this.present('content')) return null; - if (this.get('filter')) { - filter = this.get('filter').toLowerCase(); + return this.get('content').filter(function(item, index, enumerable) { + if (_this.get('onlyOverridden') && !item.get('overridden')) return false; + if (filter) { + if (item.get('setting').toLowerCase().indexOf(filter) > -1) return true; + if (item.get('description').toLowerCase().indexOf(filter) > -1) return true; + if (item.get('value').toLowerCase().indexOf(filter) > -1) return true; + return false; } - return this.get('content').filter(function(item, index, enumerable) { - if (_this.get('onlyOverridden') && !item.get('overridden')) return false; - if (filter) { - if (item.get('setting').toLowerCase().indexOf(filter) > -1) return true; - if (item.get('description').toLowerCase().indexOf(filter) > -1) return true; - if (item.get('value').toLowerCase().indexOf(filter) > -1) return true; - return false; - } + return true; + }); + }).property('filter', 'content.@each', 'onlyOverridden'), - return true; - }); - }).property('filter', 'content.@each', 'onlyOverridden'), + /** + Reset a setting to its default value - /** - Reset a setting to its default value + @method resetDefault + @param {Discourse.SiteSetting} setting The setting we want to revert + **/ + resetDefault: function(setting) { + setting.set('value', setting.get('default')); + setting.save(); + }, - @method resetDefault - @param {Discourse.SiteSetting} setting The setting we want to revert - **/ - resetDefault: function(setting) { - setting.set('value', setting.get('default')); - setting.save(); - }, + /** + Save changes to a site setting - /** - Save changes to a site setting + @method save + @param {Discourse.SiteSetting} setting The setting we've changed + **/ + save: function(setting) { + setting.save(); + }, - @method save - @param {Discourse.SiteSetting} setting The setting we've changed - **/ - save: function(setting) { - setting.save(); - }, + /** + Cancel changes to a site setting - /** - Cancel changes to a site setting - - @method cancel - @param {Discourse.SiteSetting} setting The setting we've changed but want to revert - **/ - cancel: function(setting) { - setting.resetValue(); - } - - }); - -}).call(this); + @method cancel + @param {Discourse.SiteSetting} setting The setting we've changed but want to revert + **/ + cancel: function(setting) { + setting.resetValue(); + } + +}); diff --git a/app/assets/javascripts/admin/controllers/admin_users_list_controller.js b/app/assets/javascripts/admin/controllers/admin_users_list_controller.js index 535602a60da..f9c40a79d7d 100644 --- a/app/assets/javascripts/admin/controllers/admin_users_list_controller.js +++ b/app/assets/javascripts/admin/controllers/admin_users_list_controller.js @@ -1,111 +1,107 @@ -(function() { +/** + This controller supports the interface for listing users in the admin section. + + @class AdminUsersListController + @extends Ember.ArrayController + @namespace Discourse + @module Discourse +**/ +Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Presence, { + username: null, + query: null, + selectAll: false, + content: null, /** - This controller supports the interface for listing users in the admin section. + Triggered when the selectAll property is changed - @class AdminUsersListController - @extends Ember.ArrayController - @namespace Discourse - @module Discourse - **/ - window.Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Presence, { - username: null, - query: null, - selectAll: false, - content: null, + @event selectAll + **/ + selectAllChanged: (function() { + var _this = this; + this.get('content').each(function(user) { + user.set('selected', _this.get('selectAll')); + }); + }).observes('selectAll'), - /** - Triggered when the selectAll property is changed + /** + Triggered when the username filter is changed - @event selectAll - **/ - selectAllChanged: (function() { - var _this = this; - this.get('content').each(function(user) { - user.set('selected', _this.get('selectAll')); - }); - }).observes('selectAll'), + @event filterUsers + **/ + filterUsers: Discourse.debounce(function() { + this.refreshUsers(); + }, 250).observes('username'), - /** - Triggered when the username filter is changed + /** + Triggered when the order of the users list is changed - @event filterUsers - **/ - filterUsers: Discourse.debounce(function() { + @event orderChanged + **/ + orderChanged: (function() { + this.refreshUsers(); + }).observes('query'), + + /** + Do we want to show the approval controls? + + @property showApproval + **/ + showApproval: (function() { + if (!Discourse.SiteSettings.must_approve_users) return false; + if (this.get('query') === 'new') return true; + if (this.get('query') === 'pending') return true; + }).property('query'), + + /** + How many users are currently selected + + @property selectedCount + **/ + selectedCount: (function() { + if (this.blank('content')) return 0; + return this.get('content').filterProperty('selected').length; + }).property('content.@each.selected'), + + /** + Do we have any selected users? + + @property hasSelection + **/ + hasSelection: (function() { + return this.get('selectedCount') > 0; + }).property('selectedCount'), + + /** + Refresh the current list of users. + + @method refreshUsers + **/ + refreshUsers: function() { + this.set('content', Discourse.AdminUser.findAll(this.get('query'), this.get('username'))); + }, + + + /** + Show the list of users. + + @method show + **/ + show: function(term) { + if (this.get('query') === term) { this.refreshUsers(); - }, 250).observes('username'), - - /** - Triggered when the order of the users list is changed - - @event orderChanged - **/ - orderChanged: (function() { - this.refreshUsers(); - }).observes('query'), - - /** - Do we want to show the approval controls? - - @property showApproval - **/ - showApproval: (function() { - if (!Discourse.SiteSettings.must_approve_users) return false; - if (this.get('query') === 'new') return true; - if (this.get('query') === 'pending') return true; - }).property('query'), - - /** - How many users are currently selected - - @property selectedCount - **/ - selectedCount: (function() { - if (this.blank('content')) return 0; - return this.get('content').filterProperty('selected').length; - }).property('content.@each.selected'), - - /** - Do we have any selected users? - - @property hasSelection - **/ - hasSelection: (function() { - return this.get('selectedCount') > 0; - }).property('selectedCount'), - - /** - Refresh the current list of users. - - @method refreshUsers - **/ - refreshUsers: function() { - this.set('content', Discourse.AdminUser.findAll(this.get('query'), this.get('username'))); - }, - - - /** - Show the list of users. - - @method show - **/ - show: function(term) { - if (this.get('query') === term) { - this.refreshUsers(); - return; - } - this.set('query', term); - }, - - /** - Approve all the currently selected users. - - @method approveUsers - **/ - approveUsers: function() { - Discourse.AdminUser.bulkApprove(this.get('content').filterProperty('selected')); + return; } - - }); + this.set('query', term); + }, -}).call(this); + /** + Approve all the currently selected users. + + @method approveUsers + **/ + approveUsers: function() { + Discourse.AdminUser.bulkApprove(this.get('content').filterProperty('selected')); + } + +}); diff --git a/app/assets/javascripts/admin/models/admin_user.js b/app/assets/javascripts/admin/models/admin_user.js index fdc69957ec9..2886f927827 100644 --- a/app/assets/javascripts/admin/models/admin_user.js +++ b/app/assets/javascripts/admin/models/admin_user.js @@ -1,190 +1,186 @@ -(function() { +/** + Our data model for dealing with users from the admin section. - /** - Our data model for dealing with users from the admin section. + @class AdminUser + @extends Discourse.Model + @namespace Discourse + @module Discourse +**/ +Discourse.AdminUser = Discourse.Model.extend({ + + deleteAllPosts: function() { + this.set('can_delete_all_posts', false); + jQuery.ajax("/admin/users/" + (this.get('id')) + "/delete_all_posts", {type: 'PUT'}); + }, - @class AdminUser - @extends Discourse.Model - @namespace Discourse - @module Discourse - **/ - window.Discourse.AdminUser = Discourse.Model.extend({ - - deleteAllPosts: function() { - this.set('can_delete_all_posts', false); - jQuery.ajax("/admin/users/" + (this.get('id')) + "/delete_all_posts", {type: 'PUT'}); - }, + // Revoke the user's admin access + revokeAdmin: function() { + this.set('admin', false); + this.set('can_grant_admin', true); + this.set('can_revoke_admin', false); + return jQuery.ajax("/admin/users/" + (this.get('id')) + "/revoke_admin", {type: 'PUT'}); + }, - // Revoke the user's admin access - revokeAdmin: function() { - this.set('admin', false); - this.set('can_grant_admin', true); - this.set('can_revoke_admin', false); - return jQuery.ajax("/admin/users/" + (this.get('id')) + "/revoke_admin", {type: 'PUT'}); - }, + grantAdmin: function() { + this.set('admin', true); + this.set('can_grant_admin', false); + this.set('can_revoke_admin', true); + jQuery.ajax("/admin/users/" + (this.get('id')) + "/grant_admin", {type: 'PUT'}); + }, - grantAdmin: function() { - this.set('admin', true); - this.set('can_grant_admin', false); - this.set('can_revoke_admin', true); - jQuery.ajax("/admin/users/" + (this.get('id')) + "/grant_admin", {type: 'PUT'}); - }, + // Revoke the user's moderation access + revokeModeration: function() { + this.set('moderator', false); + this.set('can_grant_moderation', true); + this.set('can_revoke_moderation', false); + return jQuery.ajax("/admin/users/" + (this.get('id')) + "/revoke_moderation", {type: 'PUT'}); + }, - // Revoke the user's moderation access - revokeModeration: function() { - this.set('moderator', false); - this.set('can_grant_moderation', true); - this.set('can_revoke_moderation', false); - return jQuery.ajax("/admin/users/" + (this.get('id')) + "/revoke_moderation", {type: 'PUT'}); - }, + grantModeration: function() { + this.set('moderator', true); + this.set('can_grant_moderation', false); + this.set('can_revoke_moderation', true); + jQuery.ajax("/admin/users/" + (this.get('id')) + "/grant_moderation", {type: 'PUT'}); + }, - grantModeration: function() { - this.set('moderator', true); - this.set('can_grant_moderation', false); - this.set('can_revoke_moderation', true); - jQuery.ajax("/admin/users/" + (this.get('id')) + "/grant_moderation", {type: 'PUT'}); - }, + refreshBrowsers: function() { + jQuery.ajax("/admin/users/" + (this.get('id')) + "/refresh_browsers", {type: 'POST'}); + bootbox.alert("Message sent to all clients!"); + }, - refreshBrowsers: function() { - jQuery.ajax("/admin/users/" + (this.get('id')) + "/refresh_browsers", {type: 'POST'}); - bootbox.alert("Message sent to all clients!"); - }, + approve: function() { + this.set('can_approve', false); + this.set('approved', true); + this.set('approved_by', Discourse.get('currentUser')); + jQuery.ajax("/admin/users/" + (this.get('id')) + "/approve", {type: 'PUT'}); + }, - approve: function() { - this.set('can_approve', false); - this.set('approved', true); - this.set('approved_by', Discourse.get('currentUser')); - jQuery.ajax("/admin/users/" + (this.get('id')) + "/approve", {type: 'PUT'}); - }, + username_lower: (function() { + return this.get('username').toLowerCase(); + }).property('username'), - username_lower: (function() { - return this.get('username').toLowerCase(); - }).property('username'), + trustLevel: (function() { + return Discourse.get('site.trust_levels').findProperty('id', this.get('trust_level')); + }).property('trust_level'), - trustLevel: (function() { - return Discourse.get('site.trust_levels').findProperty('id', this.get('trust_level')); - }).property('trust_level'), + canBan: (function() { + return !this.admin && !this.moderator; + }).property('admin', 'moderator'), - canBan: (function() { - return !this.admin && !this.moderator; - }).property('admin', 'moderator'), + banDuration: (function() { + var banned_at, banned_till; + banned_at = Date.create(this.banned_at); + banned_till = Date.create(this.banned_till); + return "" + (banned_at.short()) + " - " + (banned_till.short()); + }).property('banned_till', 'banned_at'), - banDuration: (function() { - var banned_at, banned_till; - banned_at = Date.create(this.banned_at); - banned_till = Date.create(this.banned_till); - return "" + (banned_at.short()) + " - " + (banned_till.short()); - }).property('banned_till', 'banned_at'), + ban: function() { + var duration, + _this = this; + if (duration = parseInt(window.prompt(Em.String.i18n('admin.user.ban_duration')), 10)) { + if (duration > 0) { + return jQuery.ajax("/admin/users/" + this.id + "/ban", { + type: 'PUT', + data: {duration: duration}, + success: function() { + window.location.reload(); + }, + error: function(e) { + var error; + error = Em.String.i18n('admin.user.ban_failed', { + error: "http: " + e.status + " - " + e.body + }); + bootbox.alert(error); + } + }); + } + } + }, - ban: function() { - var duration, - _this = this; - if (duration = parseInt(window.prompt(Em.String.i18n('admin.user.ban_duration')), 10)) { - if (duration > 0) { - return jQuery.ajax("/admin/users/" + this.id + "/ban", { - type: 'PUT', - data: {duration: duration}, - success: function() { - window.location.reload(); - }, - error: function(e) { - var error; - error = Em.String.i18n('admin.user.ban_failed', { - error: "http: " + e.status + " - " + e.body - }); - bootbox.alert(error); - } - }); + unban: function() { + var _this = this; + return jQuery.ajax("/admin/users/" + this.id + "/unban", { + type: 'PUT', + success: function() { + window.location.reload(); + }, + error: function(e) { + var error; + error = Em.String.i18n('admin.user.unban_failed', { + error: "http: " + e.status + " - " + e.body + }); + bootbox.alert(error); + } + }); + }, + + impersonate: function() { + var _this = this; + return jQuery.ajax("/admin/impersonate", { + type: 'POST', + data: { + username_or_email: this.get('username') + }, + success: function() { + document.location = "/"; + }, + error: function(e) { + _this.set('loading', false); + if (e.status === 404) { + return bootbox.alert(Em.String.i18n('admin.impersonate.not_found')); + } else { + return bootbox.alert(Em.String.i18n('admin.impersonate.invalid')); } } - }, + }); + } - unban: function() { - var _this = this; - return jQuery.ajax("/admin/users/" + this.id + "/unban", { - type: 'PUT', - success: function() { - window.location.reload(); - }, - error: function(e) { - var error; - error = Em.String.i18n('admin.user.unban_failed', { - error: "http: " + e.status + " - " + e.body - }); - bootbox.alert(error); - } - }); - }, +}); - impersonate: function() { - var _this = this; - return jQuery.ajax("/admin/impersonate", { - type: 'POST', - data: { - username_or_email: this.get('username') - }, - success: function() { - document.location = "/"; - }, - error: function(e) { - _this.set('loading', false); - if (e.status === 404) { - return bootbox.alert(Em.String.i18n('admin.impersonate.not_found')); - } else { - return bootbox.alert(Em.String.i18n('admin.impersonate.invalid')); - } - } - }); - } +window.Discourse.AdminUser.reopenClass({ - }); + bulkApprove: function(users) { + users.each(function(user) { + user.set('approved', true); + user.set('can_approve', false); + return user.set('selected', false); + }); + return jQuery.ajax("/admin/users/approve-bulk", { + type: 'PUT', + data: { + users: users.map(function(u) { + return u.id; + }) + } + }); + }, - window.Discourse.AdminUser.reopenClass({ + find: function(username) { + var promise; + promise = new RSVP.Promise(); + jQuery.ajax({ + url: "/admin/users/" + username, + success: function(result) { + return promise.resolve(Discourse.AdminUser.create(result)); + } + }); + return promise; + }, - bulkApprove: function(users) { - users.each(function(user) { - user.set('approved', true); - user.set('can_approve', false); - return user.set('selected', false); - }); - return jQuery.ajax("/admin/users/approve-bulk", { - type: 'PUT', - data: { - users: users.map(function(u) { - return u.id; - }) - } - }); - }, - - find: function(username) { - var promise; - promise = new RSVP.Promise(); - jQuery.ajax({ - url: "/admin/users/" + username, - success: function(result) { - return promise.resolve(Discourse.AdminUser.create(result)); - } - }); - return promise; - }, - - findAll: function(query, filter) { - var result; - result = Em.A(); - jQuery.ajax({ - url: "/admin/users/list/" + query + ".json", - data: { - filter: filter - }, - success: function(users) { - return users.each(function(u) { - return result.pushObject(Discourse.AdminUser.create(u)); - }); - } - }); - return result; - } - }); - -}).call(this); + findAll: function(query, filter) { + var result; + result = Em.A(); + jQuery.ajax({ + url: "/admin/users/list/" + query + ".json", + data: { + filter: filter + }, + success: function(users) { + return users.each(function(u) { + return result.pushObject(Discourse.AdminUser.create(u)); + }); + } + }); + return result; + } +}); diff --git a/app/assets/javascripts/admin/models/email_log.js b/app/assets/javascripts/admin/models/email_log.js index 4169397ae00..1fd292567b4 100644 --- a/app/assets/javascripts/admin/models/email_log.js +++ b/app/assets/javascripts/admin/models/email_log.js @@ -1,38 +1,36 @@ -(function() { +/** + Our data model for representing an email log. - /** - Our data model for representing an email log. + @class EmailLog + @extends Discourse.Model + @namespace Discourse + @module Discourse +**/ +Discourse.EmailLog = Discourse.Model.extend({}); - @class EmailLog - @extends Discourse.Model - @namespace Discourse - @module Discourse - **/ - window.Discourse.EmailLog = Discourse.Model.extend({}); +Discourse.EmailLog.reopenClass({ - window.Discourse.EmailLog.reopenClass({ - - create: function(attrs) { - if (attrs.user) { - attrs.user = Discourse.AdminUser.create(attrs.user); - } - return this._super(attrs); - }, - - findAll: function(filter) { - var result; - result = Em.A(); - jQuery.ajax({ - url: "/admin/email_logs.json", - data: { filter: filter }, - success: function(logs) { - logs.each(function(log) { - result.pushObject(Discourse.EmailLog.create(log)); - }); - } - }); - return result; + create: function(attrs) { + if (attrs.user) { + attrs.user = Discourse.AdminUser.create(attrs.user); } - }); + return this._super(attrs); + }, + + findAll: function(filter) { + var result; + result = Em.A(); + jQuery.ajax({ + url: "/admin/email_logs.json", + data: { filter: filter }, + success: function(logs) { + logs.each(function(log) { + result.pushObject(Discourse.EmailLog.create(log)); + }); + } + }); + return result; + } +}); + -}).call(this); diff --git a/app/assets/javascripts/admin/models/flagged_post.js b/app/assets/javascripts/admin/models/flagged_post.js index ef8fc8cfd6e..cf937dbc883 100644 --- a/app/assets/javascripts/admin/models/flagged_post.js +++ b/app/assets/javascripts/admin/models/flagged_post.js @@ -1,85 +1,56 @@ -(function() { +/** + Our data model for interacting with flagged posts. - /** - Our data model for interacting with flagged posts. + @class FlaggedPost + @extends Discourse.Post + @namespace Discourse + @module Discourse +**/ +Discourse.FlaggedPost = Discourse.Post.extend({ - @class FlaggedPost - @extends Discourse.Post - @namespace Discourse - @module Discourse - **/ - window.Discourse.FlaggedPost = Discourse.Post.extend({ + flaggers: (function() { + var r, + _this = this; + r = []; + this.post_actions.each(function(a) { + return r.push(_this.userLookup[a.user_id]); + }); + return r; + }).property(), - flaggers: (function() { - var r, - _this = this; - r = []; - this.post_actions.each(function(a) { - return r.push(_this.userLookup[a.user_id]); - }); - return r; - }).property(), - - messages: (function() { - var r, - _this = this; - r = []; - this.post_actions.each(function(a) { - if (a.message) { - return r.push({ - user: _this.userLookup[a.user_id], - message: a.message - }); - } - }); - return r; - }).property(), - - lastFlagged: (function() { - return this.post_actions[0].created_at; - }).property(), - - user: (function() { - return this.userLookup[this.user_id]; - }).property(), - - topicHidden: (function() { - return this.get('topic_visible') === 'f'; - }).property('topic_hidden'), - - deletePost: function() { - var promise; - promise = new RSVP.Promise(); - if (this.get('post_number') === "1") { - return jQuery.ajax("/t/" + this.topic_id, { - type: 'DELETE', - cache: false, - success: function() { - promise.resolve(); - }, - error: function(e) { - promise.reject(); - } - }); - } else { - return jQuery.ajax("/posts/" + this.id, { - type: 'DELETE', - cache: false, - success: function() { - promise.resolve(); - }, - error: function(e) { - promise.reject(); - } + messages: (function() { + var r, + _this = this; + r = []; + this.post_actions.each(function(a) { + if (a.message) { + return r.push({ + user: _this.userLookup[a.user_id], + message: a.message }); } - }, + }); + return r; + }).property(), - clearFlags: function() { - var promise; - promise = new RSVP.Promise(); - jQuery.ajax("/admin/flags/clear/" + this.id, { - type: 'POST', + lastFlagged: (function() { + return this.post_actions[0].created_at; + }).property(), + + user: (function() { + return this.userLookup[this.user_id]; + }).property(), + + topicHidden: (function() { + return this.get('topic_visible') === 'f'; + }).property('topic_hidden'), + + deletePost: function() { + var promise; + promise = new RSVP.Promise(); + if (this.get('post_number') === "1") { + return jQuery.ajax("/t/" + this.topic_id, { + type: 'DELETE', cache: false, success: function() { promise.resolve(); @@ -88,37 +59,64 @@ promise.reject(); } }); - return promise; - }, - - hiddenClass: (function() { - if (this.get('hidden') === "t") return "hidden-post"; - }).property() - - }); - - window.Discourse.FlaggedPost.reopenClass({ - findAll: function(filter) { - var result; - result = Em.A(); - jQuery.ajax({ - url: "/admin/flags/" + filter + ".json", - success: function(data) { - var userLookup; - userLookup = {}; - data.users.each(function(u) { - userLookup[u.id] = Discourse.User.create(u); - }); - return data.posts.each(function(p) { - var f; - f = Discourse.FlaggedPost.create(p); - f.userLookup = userLookup; - return result.pushObject(f); - }); + } else { + return jQuery.ajax("/posts/" + this.id, { + type: 'DELETE', + cache: false, + success: function() { + promise.resolve(); + }, + error: function(e) { + promise.reject(); } }); - return result; } - }); + }, + + clearFlags: function() { + var promise; + promise = new RSVP.Promise(); + jQuery.ajax("/admin/flags/clear/" + this.id, { + type: 'POST', + cache: false, + success: function() { + promise.resolve(); + }, + error: function(e) { + promise.reject(); + } + }); + return promise; + }, + + hiddenClass: (function() { + if (this.get('hidden') === "t") return "hidden-post"; + }).property() + +}); + +Discourse.FlaggedPost.reopenClass({ + findAll: function(filter) { + var result; + result = Em.A(); + jQuery.ajax({ + url: "/admin/flags/" + filter + ".json", + success: function(data) { + var userLookup; + userLookup = {}; + data.users.each(function(u) { + userLookup[u.id] = Discourse.User.create(u); + }); + return data.posts.each(function(p) { + var f; + f = Discourse.FlaggedPost.create(p); + f.userLookup = userLookup; + return result.pushObject(f); + }); + } + }); + return result; + } +}); + -}).call(this); diff --git a/app/assets/javascripts/admin/models/site_customization.js b/app/assets/javascripts/admin/models/site_customization.js index 9820ecaf8c3..19f2a3bacfa 100644 --- a/app/assets/javascripts/admin/models/site_customization.js +++ b/app/assets/javascripts/admin/models/site_customization.js @@ -1,117 +1,112 @@ -(function() { - var SiteCustomizations; +/** + Our data model for interacting with site customizations. - /** - Our data model for interacting with site customizations. + @class SiteCustomization + @extends Discourse.Model + @namespace Discourse + @module Discourse +**/ +Discourse.SiteCustomization = Discourse.Model.extend({ + trackedProperties: ['enabled', 'name', 'stylesheet', 'header', 'override_default_style'], - @class SiteCustomization - @extends Discourse.Model - @namespace Discourse - @module Discourse - **/ - window.Discourse.SiteCustomization = Discourse.Model.extend({ - trackedProperties: ['enabled', 'name', 'stylesheet', 'header', 'override_default_style'], + init: function() { + this._super(); + return this.startTrackingChanges(); + }, + + description: (function() { + return "" + this.name + (this.enabled ? ' (*)' : ''); + }).property('selected', 'name'), - init: function() { - this._super(); - return this.startTrackingChanges(); - }, - - description: (function() { - return "" + this.name + (this.enabled ? ' (*)' : ''); - }).property('selected', 'name'), - - changed: (function() { - var _this = this; - if (!this.originals) { - return false; - } - return this.trackedProperties.any(function(p) { - return _this.originals[p] !== _this.get(p); - }); - }).property('override_default_style', 'enabled', 'name', 'stylesheet', 'header', 'originals'), - - startTrackingChanges: function() { - var _this = this; - this.set('originals', {}); - return this.trackedProperties.each(function(p) { - _this.originals[p] = _this.get(p); - return true; - }); - }, - - previewUrl: (function() { - return "/?preview-style=" + (this.get('key')); - }).property('key'), - - disableSave: (function() { - return !this.get('changed'); - }).property('changed'), - - save: function() { - var data; - this.startTrackingChanges(); - data = { - name: this.name, - enabled: this.enabled, - stylesheet: this.stylesheet, - header: this.header, - override_default_style: this.override_default_style - }; - return jQuery.ajax({ - url: "/admin/site_customizations" + (this.id ? '/' + this.id : ''), - data: { - site_customization: data - }, - type: this.id ? 'PUT' : 'POST' - }); - }, - - "delete": function() { - if (!this.id) return; - - return jQuery.ajax({ - url: "/admin/site_customizations/" + this.id, - type: 'DELETE' - }); + changed: (function() { + var _this = this; + if (!this.originals) { + return false; } + return this.trackedProperties.any(function(p) { + return _this.originals[p] !== _this.get(p); + }); + }).property('override_default_style', 'enabled', 'name', 'stylesheet', 'header', 'originals'), - }); + startTrackingChanges: function() { + var _this = this; + this.set('originals', {}); + return this.trackedProperties.each(function(p) { + _this.originals[p] = _this.get(p); + return true; + }); + }, - SiteCustomizations = Ember.ArrayProxy.extend({ - selectedItemChanged: (function() { - var selected; - selected = this.get('selectedItem'); - return this.get('content').each(function(i) { - return i.set('selected', selected === i); - }); - }).observes('selectedItem') - }); + previewUrl: (function() { + return "/?preview-style=" + (this.get('key')); + }).property('key'), - Discourse.SiteCustomization.reopenClass({ - findAll: function() { - var content, - _this = this; - content = SiteCustomizations.create({ - content: [], - loading: true - }); - jQuery.ajax({ - url: "/admin/site_customizations", - dataType: "json", - success: function(data) { - if (data) { - data.site_customizations.each(function(c) { - var item; - item = Discourse.SiteCustomization.create(c); - return content.pushObject(item); - }); - } - return content.set('loading', false); + disableSave: (function() { + return !this.get('changed'); + }).property('changed'), + + save: function() { + var data; + this.startTrackingChanges(); + data = { + name: this.name, + enabled: this.enabled, + stylesheet: this.stylesheet, + header: this.header, + override_default_style: this.override_default_style + }; + return jQuery.ajax({ + url: "/admin/site_customizations" + (this.id ? '/' + this.id : ''), + data: { + site_customization: data + }, + type: this.id ? 'PUT' : 'POST' + }); + }, + + "delete": function() { + if (!this.id) return; + + return jQuery.ajax({ + url: "/admin/site_customizations/" + this.id, + type: 'DELETE' + }); + } + +}); + +var SiteCustomizations = Ember.ArrayProxy.extend({ + selectedItemChanged: (function() { + var selected; + selected = this.get('selectedItem'); + return this.get('content').each(function(i) { + return i.set('selected', selected === i); + }); + }).observes('selectedItem') +}); + +Discourse.SiteCustomization.reopenClass({ + findAll: function() { + var content, + _this = this; + content = SiteCustomizations.create({ + content: [], + loading: true + }); + jQuery.ajax({ + url: "/admin/site_customizations", + dataType: "json", + success: function(data) { + if (data) { + data.site_customizations.each(function(c) { + var item; + item = Discourse.SiteCustomization.create(c); + return content.pushObject(item); + }); } - }); - return content; - } - }); - -}).call(this); + return content.set('loading', false); + } + }); + return content; + } +}); diff --git a/app/assets/javascripts/admin/models/site_setting.js b/app/assets/javascripts/admin/models/site_setting.js index 155871f7218..86eeaac39f1 100644 --- a/app/assets/javascripts/admin/models/site_setting.js +++ b/app/assets/javascripts/admin/models/site_setting.js @@ -1,65 +1,63 @@ -(function() { +/** + Our data model for interacting with site settings. - /** - Our data model for interacting with site settings. + @class SiteSetting + @extends Discourse.Model + @namespace Discourse + @module Discourse +**/ +Discourse.SiteSetting = Discourse.Model.extend({ + + // Whether a property is short. + short: (function() { + if (this.blank('value')) return true; + return this.get('value').toString().length < 80; + }).property('value'), - @class SiteSetting - @extends Discourse.Model - @namespace Discourse - @module Discourse - **/ - window.Discourse.SiteSetting = Discourse.Model.extend({ - - // Whether a property is short. - short: (function() { - if (this.blank('value')) return true; - return this.get('value').toString().length < 80; - }).property('value'), + // Whether the site setting has changed + dirty: (function() { + return this.get('originalValue') !== this.get('value'); + }).property('originalValue', 'value'), - // Whether the site setting has changed - dirty: (function() { - return this.get('originalValue') !== this.get('value'); - }).property('originalValue', 'value'), + overridden: (function() { + var defaultVal, val; + val = this.get('value'); + defaultVal = this.get('default'); + if (val && defaultVal) { + return val.toString() !== defaultVal.toString(); + } + return val !== defaultVal; + }).property('value'), - overridden: (function() { - var defaultVal, val; - val = this.get('value'); - defaultVal = this.get('default'); - if (val && defaultVal) { - return val.toString() !== defaultVal.toString(); + resetValue: function() { + this.set('value', this.get('originalValue')); + }, + + save: function() { + // Update the setting + var _this = this; + return jQuery.ajax("/admin/site_settings/" + (this.get('setting')), { + data: { value: this.get('value') }, + type: 'PUT', + success: function() { + _this.set('originalValue', _this.get('value')); } - return val !== defaultVal; - }).property('value'), + }); + } +}); - resetValue: function() { - this.set('value', this.get('originalValue')); - }, - - save: function() { - // Update the setting - var _this = this; - return jQuery.ajax("/admin/site_settings/" + (this.get('setting')), { - data: { value: this.get('value') }, - type: 'PUT', - success: function() { - _this.set('originalValue', _this.get('value')); - } +Discourse.SiteSetting.reopenClass({ + findAll: function() { + var result; + result = Em.A(); + jQuery.get("/admin/site_settings", function(settings) { + return settings.each(function(s) { + s.originalValue = s.value; + return result.pushObject(Discourse.SiteSetting.create(s)); }); - } - }); + }); + return result; + } +}); - window.Discourse.SiteSetting.reopenClass({ - findAll: function() { - var result; - result = Em.A(); - jQuery.get("/admin/site_settings", function(settings) { - return settings.each(function(s) { - s.originalValue = s.value; - return result.pushObject(Discourse.SiteSetting.create(s)); - }); - }); - return result; - } - }); -}).call(this); diff --git a/app/assets/javascripts/admin/models/version_check.js b/app/assets/javascripts/admin/models/version_check.js index 5692b7d2885..6a42b1eff51 100644 --- a/app/assets/javascripts/admin/models/version_check.js +++ b/app/assets/javascripts/admin/models/version_check.js @@ -1,39 +1,35 @@ -(function() { +/** + Our data model for determining whether there's a new version of Discourse - /** - Our data model for determining whether there's a new version of Discourse + @class VersionCheck + @extends Discourse.Model + @namespace Discourse + @module Discourse +**/ +Discourse.VersionCheck = Discourse.Model.extend({ + upToDate: function() { + return this.get('latest_version') === this.get('installed_version'); + }.property('latest_version', 'installed_version'), - @class VersionCheck - @extends Discourse.Model - @namespace Discourse - @module Discourse - **/ - window.Discourse.VersionCheck = Discourse.Model.extend({ - upToDate: function() { - return this.get('latest_version') === this.get('installed_version'); - }.property('latest_version', 'installed_version'), + gitLink: function() { + return "https://github.com/discourse/discourse/tree/" + this.get('installed_sha'); + }.property('installed_sha'), - gitLink: function() { - return "https://github.com/discourse/discourse/tree/" + this.get('installed_sha'); - }.property('installed_sha'), + shortSha: function() { + return this.get('installed_sha').substr(0,10); + }.property('installed_sha') +}); - shortSha: function() { - return this.get('installed_sha').substr(0,10); - }.property('installed_sha') - }); - - Discourse.VersionCheck.reopenClass({ - find: function() { - var promise = new RSVP.Promise(); - jQuery.ajax({ - url: '/admin/version_check', - dataType: 'json', - success: function(json) { - promise.resolve(Discourse.VersionCheck.create(json)); - } - }); - return promise; - } - }); - -}).call(this); +Discourse.VersionCheck.reopenClass({ + find: function() { + var promise = new RSVP.Promise(); + jQuery.ajax({ + url: '/admin/version_check', + dataType: 'json', + success: function(json) { + promise.resolve(Discourse.VersionCheck.create(json)); + } + }); + return promise; + } +}); \ No newline at end of file diff --git a/app/assets/javascripts/admin/routes/admin_customize_route.js b/app/assets/javascripts/admin/routes/admin_customize_route.js index cd5f60f5513..e085791561b 100644 --- a/app/assets/javascripts/admin/routes/admin_customize_route.js +++ b/app/assets/javascripts/admin/routes/admin_customize_route.js @@ -1,21 +1,19 @@ -(function() { +/** + Handles routes related to customization - /** - Handles routes related to customization + @class AdminCustomizeRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminCustomizeRoute = Discourse.Route.extend({ + model: function() { + return Discourse.SiteCustomization.findAll(); + }, - @class AdminCustomizeRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminCustomizeRoute = Discourse.Route.extend({ - model: function() { - return Discourse.SiteCustomization.findAll(); - }, + renderTemplate: function() { + this.render({into: 'admin/templates/admin'}); + } +}); - renderTemplate: function() { - this.render({into: 'admin/templates/admin'}); - } - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_dashboard_route.js b/app/assets/javascripts/admin/routes/admin_dashboard_route.js index 7293f341bc0..49a745eadb2 100644 --- a/app/assets/javascripts/admin/routes/admin_dashboard_route.js +++ b/app/assets/javascripts/admin/routes/admin_dashboard_route.js @@ -1,33 +1,30 @@ -(function() { +/** + Handles the default admin route - /** - Handles the default admin route - - @class AdminDashboardRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminDashboardRoute = Discourse.Route.extend({ - setupController: function(c) { - if( !c.get('versionCheckedAt') || Date.create('12 hours ago') > c.get('versionCheckedAt') ) { - this.checkVersion(c); - } - }, - - renderTemplate: function() { - this.render({into: 'admin/templates/admin'}); - }, - - checkVersion: function(c) { - if( Discourse.SiteSettings.version_checks ) { - Discourse.VersionCheck.find().then(function(vc) { - c.set('versionCheck', vc); - c.set('versionCheckedAt', new Date()); - c.set('loading', false); - }); - } + @class AdminDashboardRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminDashboardRoute = Discourse.Route.extend({ + setupController: function(c) { + if( !c.get('versionCheckedAt') || Date.create('12 hours ago') > c.get('versionCheckedAt') ) { + this.checkVersion(c); } - }); + }, + + renderTemplate: function() { + this.render({into: 'admin/templates/admin'}); + }, + + checkVersion: function(c) { + if( Discourse.SiteSettings.version_checks ) { + Discourse.VersionCheck.find().then(function(vc) { + c.set('versionCheck', vc); + c.set('versionCheckedAt', new Date()); + c.set('loading', false); + }); + } + } +}); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_email_logs_route.js b/app/assets/javascripts/admin/routes/admin_email_logs_route.js index 3b763c3f575..f1fa425131d 100644 --- a/app/assets/javascripts/admin/routes/admin_email_logs_route.js +++ b/app/assets/javascripts/admin/routes/admin_email_logs_route.js @@ -1,21 +1,19 @@ -(function() { +/** + Handles routes related to viewing email logs. - /** - Handles routes related to viewing email logs. + @class AdminEmailLogsRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminEmailLogsRoute = Discourse.Route.extend({ + model: function() { + return Discourse.EmailLog.findAll(); + }, - @class AdminEmailLogsRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminEmailLogsRoute = Discourse.Route.extend({ - model: function() { - return Discourse.EmailLog.findAll(); - }, + renderTemplate: function() { + this.render('admin/templates/email_logs'); + } +}); - renderTemplate: function() { - this.render('admin/templates/email_logs'); - } - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_flags_active_route.js b/app/assets/javascripts/admin/routes/admin_flags_active_route.js index 8623feb576e..9ae171a0a3e 100644 --- a/app/assets/javascripts/admin/routes/admin_flags_active_route.js +++ b/app/assets/javascripts/admin/routes/admin_flags_active_route.js @@ -1,25 +1,23 @@ -(function() { +/** + Handles routes related to viewing active flags. - /** - Handles routes related to viewing active flags. + @class AdminFlagsActiveRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminFlagsActiveRoute = Discourse.Route.extend({ - @class AdminFlagsActiveRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminFlagsActiveRoute = Discourse.Route.extend({ + model: function() { + return Discourse.FlaggedPost.findAll('active'); + }, - model: function() { - return Discourse.FlaggedPost.findAll('active'); - }, + setupController: function(controller, model) { + var adminFlagsController = this.controllerFor('adminFlags'); + adminFlagsController.set('content', model); + adminFlagsController.set('query', 'active'); + } - setupController: function(controller, model) { - var adminFlagsController = this.controllerFor('adminFlags'); - adminFlagsController.set('content', model); - adminFlagsController.set('query', 'active'); - } +}); - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_flags_old_route.js b/app/assets/javascripts/admin/routes/admin_flags_old_route.js index 0ac9079287e..df967f53c83 100644 --- a/app/assets/javascripts/admin/routes/admin_flags_old_route.js +++ b/app/assets/javascripts/admin/routes/admin_flags_old_route.js @@ -1,25 +1,23 @@ -(function() { +/** + Handles routes related to viewing old flags. - /** - Handles routes related to viewing old flags. + @class AdminFlagsOldRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminFlagsOldRoute = Discourse.Route.extend({ + + model: function() { + return Discourse.FlaggedPost.findAll('old'); + }, - @class AdminFlagsOldRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminFlagsOldRoute = Discourse.Route.extend({ - - model: function() { - return Discourse.FlaggedPost.findAll('old'); - }, + setupController: function(controller, model) { + var adminFlagsController = this.controllerFor('adminFlags'); + adminFlagsController.set('content', model); + adminFlagsController.set('query', 'old'); + } - setupController: function(controller, model) { - var adminFlagsController = this.controllerFor('adminFlags'); - adminFlagsController.set('content', model); - adminFlagsController.set('query', 'old'); - } +}); - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_flags_route.js b/app/assets/javascripts/admin/routes/admin_flags_route.js index c78f0caafc8..7def67540d9 100644 --- a/app/assets/javascripts/admin/routes/admin_flags_route.js +++ b/app/assets/javascripts/admin/routes/admin_flags_route.js @@ -1,17 +1,15 @@ -(function() { +/** + Basic route for admin flags - /** - Basic route for admin flags + @class AdminFlagsRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminFlagsRoute = Discourse.Route.extend({ + renderTemplate: function() { + this.render('admin/templates/flags'); + } +}); - @class AdminFlagsRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminFlagsRoute = Discourse.Route.extend({ - renderTemplate: function() { - this.render('admin/templates/flags'); - } - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_route.js b/app/assets/javascripts/admin/routes/admin_route.js index a168172a3dc..a28ffff2eba 100644 --- a/app/assets/javascripts/admin/routes/admin_route.js +++ b/app/assets/javascripts/admin/routes/admin_route.js @@ -1,17 +1,15 @@ -(function() { +/** + The base admin route - /** - The base admin route + @class AdminRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminRoute = Discourse.Route.extend({ + renderTemplate: function() { + this.render('admin/templates/admin'); + } +}); - @class AdminRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminRoute = Discourse.Route.extend({ - renderTemplate: function() { - this.render('admin/templates/admin'); - } - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_routes.js b/app/assets/javascripts/admin/routes/admin_routes.js index bebaddcbaaf..215a7ba14c1 100644 --- a/app/assets/javascripts/admin/routes/admin_routes.js +++ b/app/assets/javascripts/admin/routes/admin_routes.js @@ -1,31 +1,32 @@ -(function() { +/** + Builds the routes for the admin section - /** - Declare all the routes used in the admin section. - **/ - Discourse.buildRoutes(function() { - return this.resource('admin', { path: '/admin' }, function() { - - this.route('dashboard', { path: '/' }); - this.route('site_settings', { path: '/site_settings' }); - this.route('email_logs', { path: '/email_logs' }); - this.route('customize', { path: '/customize' }); + @method buildRoutes + @for Discourse.AdminRoute +**/ +Discourse.buildRoutes(function() { + this.resource('admin', { path: '/admin' }, function() { - this.resource('adminFlags', { path: '/flags' }, function() { - this.route('active', { path: '/active' }); - this.route('old', { path: '/old' }); - }); - - this.resource('adminUsers', { path: '/users' }, function() { - this.resource('adminUser', { path: '/:username' }); - this.resource('adminUsersList', { path: '/list' }, function() { - this.route('active', { path: '/active' }); - this.route('new', { path: '/new' }); - this.route('pending', { path: '/pending' }); - }); - }); + this.route('dashboard', { path: '/' }); + this.route('site_settings', { path: '/site_settings' }); + this.route('email_logs', { path: '/email_logs' }); + this.route('customize', { path: '/customize' }); + this.resource('adminFlags', { path: '/flags' }, function() { + this.route('active', { path: '/active' }); + this.route('old', { path: '/old' }); }); - }); -}).call(this); + this.resource('adminUsers', { path: '/users' }, function() { + this.resource('adminUser', { path: '/:username' }); + this.resource('adminUsersList', { path: '/list' }, function() { + this.route('active', { path: '/active' }); + this.route('new', { path: '/new' }); + this.route('pending', { path: '/pending' }); + }); + }); + + }); +}); + + diff --git a/app/assets/javascripts/admin/routes/admin_site_settings_route.js b/app/assets/javascripts/admin/routes/admin_site_settings_route.js index 66d51d77919..5043b40a0c7 100644 --- a/app/assets/javascripts/admin/routes/admin_site_settings_route.js +++ b/app/assets/javascripts/admin/routes/admin_site_settings_route.js @@ -1,21 +1,19 @@ -(function() { +/** + Handles routes related to viewing and editing site settings. - /** - Handles routes related to viewing and editing site settings. + @class AdminSiteSettingsRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminSiteSettingsRoute = Discourse.Route.extend({ + model: function() { + return Discourse.SiteSetting.findAll(); + }, - @class AdminSiteSettingsRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminSiteSettingsRoute = Discourse.Route.extend({ - model: function() { - return Discourse.SiteSetting.findAll(); - }, + renderTemplate: function() { + this.render('admin/templates/site_settings', {into: 'admin/templates/admin'}); + } +}); - renderTemplate: function() { - this.render('admin/templates/site_settings', {into: 'admin/templates/admin'}); - } - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_user_route.js b/app/assets/javascripts/admin/routes/admin_user_route.js index 1e67210d82b..343dce69549 100644 --- a/app/assets/javascripts/admin/routes/admin_user_route.js +++ b/app/assets/javascripts/admin/routes/admin_user_route.js @@ -1,22 +1,20 @@ -(function() { +/** + Handles routes related to users in the admin section. - /** - Handles routes related to users in the admin section. + @class AdminUserRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminUserRoute = Discourse.Route.extend({ + model: function(params) { + return Discourse.AdminUser.find(params.username); + }, - @class AdminUserRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminUserRoute = Discourse.Route.extend({ - model: function(params) { - return Discourse.AdminUser.find(params.username); - }, + renderTemplate: function() { + this.render('admin/templates/user', {into: 'admin/templates/admin'}); + } - renderTemplate: function() { - this.render('admin/templates/user', {into: 'admin/templates/admin'}); - } +}); - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_users_list_active_route.js b/app/assets/javascripts/admin/routes/admin_users_list_active_route.js index 9d80ed52e91..46b23537bf7 100644 --- a/app/assets/javascripts/admin/routes/admin_users_list_active_route.js +++ b/app/assets/javascripts/admin/routes/admin_users_list_active_route.js @@ -1,17 +1,15 @@ -(function() { +/** + Handles the route that lists active users. - /** - Handles the route that lists active users. + @class AdminUsersListActiveRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminUsersListActiveRoute = Discourse.Route.extend({ + setupController: function() { + return this.controllerFor('adminUsersList').show('active'); + } +}); - @class AdminUsersListActiveRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminUsersListActiveRoute = Discourse.Route.extend({ - setupController: function() { - return this.controllerFor('adminUsersList').show('active'); - } - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_users_list_new_route.js b/app/assets/javascripts/admin/routes/admin_users_list_new_route.js index bc6008f1a4e..48f22a38e22 100644 --- a/app/assets/javascripts/admin/routes/admin_users_list_new_route.js +++ b/app/assets/javascripts/admin/routes/admin_users_list_new_route.js @@ -1,17 +1,15 @@ -(function() { +/** + Handles the route that lists new users. - /** - Handles the route that lists new users. + @class AdminUsersListNewRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminUsersListNewRoute = Discourse.Route.extend({ + setupController: function() { + return this.controllerFor('adminUsersList').show('new'); + } +}); - @class AdminUsersListNewRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminUsersListNewRoute = Discourse.Route.extend({ - setupController: function() { - return this.controllerFor('adminUsersList').show('new'); - } - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_users_list_pending_route.js b/app/assets/javascripts/admin/routes/admin_users_list_pending_route.js index 3b5376a64f1..bd2efaf6a4c 100644 --- a/app/assets/javascripts/admin/routes/admin_users_list_pending_route.js +++ b/app/assets/javascripts/admin/routes/admin_users_list_pending_route.js @@ -1,17 +1,15 @@ -(function() { +/** + Handles the route that lists pending users. - /** - Handles the route that lists pending users. + @class AdminUsersListNewRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminUsersListPendingRoute = Discourse.Route.extend({ + setupController: function() { + return this.controllerFor('adminUsersList').show('pending'); + } +}); - @class AdminUsersListNewRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminUsersListPendingRoute = Discourse.Route.extend({ - setupController: function() { - return this.controllerFor('adminUsersList').show('pending'); - } - }); -}).call(this); diff --git a/app/assets/javascripts/admin/routes/admin_users_list_route.js b/app/assets/javascripts/admin/routes/admin_users_list_route.js index a08336be0df..757c7efa2ca 100644 --- a/app/assets/javascripts/admin/routes/admin_users_list_route.js +++ b/app/assets/javascripts/admin/routes/admin_users_list_route.js @@ -1,17 +1,15 @@ -(function() { +/** + Handles the route that deals with listing users - /** - Handles the route that deals with listing users + @class AdminUsersListRoute + @extends Discourse.Route + @namespace Discourse + @module Discourse +**/ +Discourse.AdminUsersListRoute = Discourse.Route.extend({ + renderTemplate: function() { + this.render('admin/templates/users_list', {into: 'admin/templates/admin'}); + } +}); - @class AdminUsersListRoute - @extends Discourse.Route - @namespace Discourse - @module Discourse - **/ - Discourse.AdminUsersListRoute = Discourse.Route.extend({ - renderTemplate: function() { - this.render('admin/templates/users_list', {into: 'admin/templates/admin'}); - } - }); -}).call(this); diff --git a/app/assets/javascripts/admin/views/ace_editor_view.js b/app/assets/javascripts/admin/views/ace_editor_view.js index f31c19d57aa..fc9849ab16b 100644 --- a/app/assets/javascripts/admin/views/ace_editor_view.js +++ b/app/assets/javascripts/admin/views/ace_editor_view.js @@ -1,66 +1,65 @@ /*global ace:true */ -(function() { - /** - A view that wraps the ACE editor (http://ace.ajax.org/) +/** + A view that wraps the ACE editor (http://ace.ajax.org/) - @class AceEditorView - @extends Em.View - @namespace Discourse - @module Discourse - **/ - Discourse.AceEditorView = Discourse.View.extend({ - mode: 'css', - classNames: ['ace-wrapper'], + @class AceEditorView + @extends Em.View + @namespace Discourse + @module Discourse +**/ +Discourse.AceEditorView = Discourse.View.extend({ + mode: 'css', + classNames: ['ace-wrapper'], - contentChanged: (function() { - if (this.editor && !this.skipContentChangeEvent) { - return this.editor.getSession().setValue(this.get('content')); - } - }).observes('content'), - - render: function(buffer) { - buffer.push("
"); - if (this.get('content')) { - buffer.push(Handlebars.Utils.escapeExpression(this.get('content'))); - } - return buffer.push("
"); - }, - - willDestroyElement: function() { - if (this.editor) { - this.editor.destroy(); - this.editor = null; - } - }, - - didInsertElement: function() { - var initAce, - _this = this; - initAce = function() { - _this.editor = ace.edit(_this.$('.ace')[0]); - _this.editor.setTheme("ace/theme/chrome"); - _this.editor.setShowPrintMargin(false); - _this.editor.getSession().setMode("ace/mode/" + (_this.get('mode'))); - return _this.editor.on("change", function(e) { - /* amending stuff as you type seems a bit out of scope for now - can revisit after launch - changes = @get('changes') - unless changes - changes = [] - @set('changes', changes) - changes.push e.data - */ - _this.skipContentChangeEvent = true; - _this.set('content', _this.editor.getSession().getValue()); - _this.skipContentChangeEvent = false; - }); - }; - if (window.ace) { - return initAce(); - } else { - return $LAB.script('http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js').wait(initAce); - } + contentChanged: (function() { + if (this.editor && !this.skipContentChangeEvent) { + return this.editor.getSession().setValue(this.get('content')); } - }); + }).observes('content'), + + render: function(buffer) { + buffer.push("
"); + if (this.get('content')) { + buffer.push(Handlebars.Utils.escapeExpression(this.get('content'))); + } + return buffer.push("
"); + }, + + willDestroyElement: function() { + if (this.editor) { + this.editor.destroy(); + this.editor = null; + } + }, + + didInsertElement: function() { + var initAce, + _this = this; + initAce = function() { + _this.editor = ace.edit(_this.$('.ace')[0]); + _this.editor.setTheme("ace/theme/chrome"); + _this.editor.setShowPrintMargin(false); + _this.editor.getSession().setMode("ace/mode/" + (_this.get('mode'))); + return _this.editor.on("change", function(e) { + /* amending stuff as you type seems a bit out of scope for now - can revisit after launch + changes = @get('changes') + unless changes + changes = [] + @set('changes', changes) + changes.push e.data + */ + _this.skipContentChangeEvent = true; + _this.set('content', _this.editor.getSession().getValue()); + _this.skipContentChangeEvent = false; + }); + }; + if (window.ace) { + return initAce(); + } else { + return $LAB.script('http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js').wait(initAce); + } + } +}); + -}).call(this); diff --git a/app/assets/javascripts/admin/views/admin_customize_view.js b/app/assets/javascripts/admin/views/admin_customize_view.js index 1ab5532b57d..90bb032c2d5 100644 --- a/app/assets/javascripts/admin/views/admin_customize_view.js +++ b/app/assets/javascripts/admin/views/admin_customize_view.js @@ -1,51 +1,50 @@ /*global Mousetrap:true */ -(function() { - /** - A view to handle site customizations +/** + A view to handle site customizations - @class AdminCustomizeView - @extends Em.View - @namespace Discourse - @module Discourse - **/ - Discourse.AdminCustomizeView = Discourse.View.extend({ - templateName: 'admin/templates/customize', - classNames: ['customize'], + @class AdminCustomizeView + @extends Em.View + @namespace Discourse + @module Discourse +**/ +Discourse.AdminCustomizeView = Discourse.View.extend({ + templateName: 'admin/templates/customize', + classNames: ['customize'], - init: function() { - this._super(); - this.set('selected', 'stylesheet'); - }, + init: function() { + this._super(); + this.set('selected', 'stylesheet'); + }, - headerActive: (function() { - return this.get('selected') === 'header'; - }).property('selected'), + headerActive: (function() { + return this.get('selected') === 'header'; + }).property('selected'), - stylesheetActive: (function() { - return this.get('selected') === 'stylesheet'; - }).property('selected'), + stylesheetActive: (function() { + return this.get('selected') === 'stylesheet'; + }).property('selected'), - selectHeader: function() { - this.set('selected', 'header'); - }, + selectHeader: function() { + this.set('selected', 'header'); + }, - selectStylesheet: function() { - this.set('selected', 'stylesheet'); - }, + selectStylesheet: function() { + this.set('selected', 'stylesheet'); + }, - didInsertElement: function() { - var _this = this; - return Mousetrap.bindGlobal(['meta+s', 'ctrl+s'], function() { - _this.get('controller').save(); - return false; - }); - }, + didInsertElement: function() { + var _this = this; + return Mousetrap.bindGlobal(['meta+s', 'ctrl+s'], function() { + _this.get('controller').save(); + return false; + }); + }, + + willDestroyElement: function() { + return Mousetrap.unbindGlobal('meta+s', 'ctrl+s'); + } + +}); - willDestroyElement: function() { - return Mousetrap.unbindGlobal('meta+s', 'ctrl+s'); - } - - }); -}).call(this); diff --git a/app/assets/javascripts/admin/views/admin_dashboard_view.js b/app/assets/javascripts/admin/views/admin_dashboard_view.js index 48c352cbefb..0d0f6faf5c2 100644 --- a/app/assets/javascripts/admin/views/admin_dashboard_view.js +++ b/app/assets/javascripts/admin/views/admin_dashboard_view.js @@ -1,33 +1,31 @@ -(function() { +/** + The default view in the admin section - /** - The default view in the admin section + @class AdminDashboardView + @extends Em.View + @namespace Discourse + @module Discourse +**/ +Discourse.AdminDashboardView = Discourse.View.extend({ + templateName: 'admin/templates/dashboard', - @class AdminDashboardView - @extends Em.View - @namespace Discourse - @module Discourse - **/ - Discourse.AdminDashboardView = Discourse.View.extend({ - templateName: 'admin/templates/dashboard', + updateIconClasses: function() { + var classes; + classes = "icon icon-warning-sign "; + if (this.get('controller.versionCheck.critical_updates')) { + classes += "critical-updates-available"; + } else { + classes += "updates-available"; + } + return classes; + }.property('controller.versionCheck.critical_updates'), - updateIconClasses: function() { - var classes; - classes = "icon icon-warning-sign "; - if (this.get('controller.versionCheck.critical_updates')) { - classes += "critical-updates-available"; - } else { - classes += "updates-available"; - } - return classes; - }.property('controller.versionCheck.critical_updates'), + priorityClass: function() { + if (this.get('controller.versionCheck.critical_updates')) { + return 'version-check critical'; + } + return 'version-check normal'; + }.property('controller.versionCheck.critical_updates') +}); - priorityClass: function() { - if (this.get('controller.versionCheck.critical_updates')) { - return 'version-check critical'; - } - return 'version-check normal'; - }.property('controller.versionCheck.critical_updates') - }); -}).call(this); diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb index ad5d61fa552..50d65abb64f 100644 --- a/app/assets/javascripts/application.js.erb +++ b/app/assets/javascripts/application.js.erb @@ -31,6 +31,7 @@ //= require ./discourse/views/view //= require ./discourse/components/debounce //= require ./discourse/controllers/controller +//= require ./discourse/controllers/object_controller //= require ./discourse/views/modal/modal_body_view //= require ./discourse/models/model //= require ./discourse/routes/discourse_route diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js index a91b730eeb8..3097e212f3a 100644 --- a/app/assets/javascripts/discourse.js +++ b/app/assets/javascripts/discourse.js @@ -2,388 +2,387 @@ /*global assetPath:true*/ /*global FastClick:true*/ -(function() { - var csrf_token; +var csrf_token; - window.Discourse = Ember.Application.createWithMixins({ - rootElement: '#main', +Discourse = Ember.Application.createWithMixins({ + rootElement: '#main', - // Data we want to remember for a short period - transient: Em.Object.create(), + // Data we want to remember for a short period + transient: Em.Object.create(), - hasFocus: true, - scrolling: false, + hasFocus: true, + scrolling: false, - // The highest seen post number by topic - highestSeenByTopic: {}, + // The highest seen post number by topic + highestSeenByTopic: {}, - logoSmall: (function() { - var logo; - logo = Discourse.SiteSettings.logo_small_url; - if (logo && logo.length > 1) { - return ""; - } else { - return ""; + logoSmall: (function() { + var logo; + logo = Discourse.SiteSettings.logo_small_url; + if (logo && logo.length > 1) { + return ""; + } else { + return ""; + } + }).property(), + + titleChanged: (function() { + var title; + title = ""; + if (this.get('title')) { + title += "" + (this.get('title')) + " - "; + } + title += Discourse.SiteSettings.title; + $('title').text(title); + if (!this.get('hasFocus') && this.get('notify')) { + title = "(*) " + title; + } + // chrome bug workaround see: http://stackoverflow.com/questions/2952384/changing-the-window-title-when-focussing-the-window-doesnt-work-in-chrome + window.setTimeout((function() { + document.title = "."; + document.title = title; + }), 200); + }).observes('title', 'hasFocus', 'notify'), + + currentUserChanged: (function() { + var bus, user; + bus = Discourse.MessageBus; + + // We don't want to receive any previous user notifications + bus.unsubscribe("/notification/*"); + bus.callbackInterval = Discourse.SiteSettings.anon_polling_interval; + bus.enableLongPolling = false; + user = this.get('currentUser'); + if (user) { + bus.callbackInterval = Discourse.SiteSettings.polling_interval; + bus.enableLongPolling = true; + if (user.admin) { + bus.subscribe("/flagged_counts", function(data) { + return user.set('site_flagged_posts_count', data.total); + }); } - }).property(), + return bus.subscribe("/notification/" + user.id, (function(data) { + user.set('unread_notifications', data.unread_notifications); + return user.set('unread_private_messages', data.unread_private_messages); + }), user.notification_channel_position); + } + }).observes('currentUser'), + notifyTitle: function() { + return this.set('notify', true); + }, - titleChanged: (function() { - var title; - title = ""; - if (this.get('title')) { - title += "" + (this.get('title')) + " - "; + // Browser aware replaceState + replaceState: function(path) { + if (window.history && + window.history.pushState && + window.history.replaceState && + !navigator.userAgent.match(/((iPod|iPhone|iPad).+\bOS\s+[1-4]|WebApps\/.+CFNetwork)/)) { + if (window.location.pathname !== path) { + return history.replaceState({ + path: path + }, null, path); } - title += Discourse.SiteSettings.title; - jQuery('title').text(title); - if (!this.get('hasFocus') && this.get('notify')) { - title = "(*) " + title; - } - // chrome bug workaround see: http://stackoverflow.com/questions/2952384/changing-the-window-title-when-focussing-the-window-doesnt-work-in-chrome - window.setTimeout((function() { - document.title = "."; - document.title = title; - }), 200); - }).observes('title', 'hasFocus', 'notify'), + } + }, - currentUserChanged: (function() { - var bus, user; - bus = Discourse.MessageBus; + openComposer: function(opts) { + // TODO, remove container link + var composer = Discourse.__container__.lookup('controller:composer'); + if (composer) composer.open(opts); + }, - // We don't want to receive any previous user notifications - bus.unsubscribe("/notification/*"); - bus.callbackInterval = Discourse.SiteSettings.anon_polling_interval; - bus.enableLongPolling = false; - user = this.get('currentUser'); - if (user) { - bus.callbackInterval = Discourse.SiteSettings.polling_interval; - bus.enableLongPolling = true; - if (user.admin) { - bus.subscribe("/flagged_counts", function(data) { - return user.set('site_flagged_posts_count', data.total); - }); - } - return bus.subscribe("/notification/" + user.id, (function(data) { - user.set('unread_notifications', data.unread_notifications); - return user.set('unread_private_messages', data.unread_private_messages); - }), user.notification_channel_position); - } - }).observes('currentUser'), - notifyTitle: function() { - return this.set('notify', true); - }, + // Like router.route, but allow full urls rather than relative one + // HERE BE HACKS - uses the ember container for now until we can do this nicer. + routeTo: function(path) { + var newMatches, newTopicId, oldMatches, oldTopicId, opts, router, topicController, topicRegexp; + path = path.replace(/https?\:\/\/[^\/]+/, ''); - // Browser aware replaceState - replaceState: function(path) { - if (window.history && - window.history.pushState && - window.history.replaceState && - !navigator.userAgent.match(/((iPod|iPhone|iPad).+\bOS\s+[1-4]|WebApps\/.+CFNetwork)/)) { - if (window.location.pathname !== path) { - return history.replaceState({ - path: path - }, null, path); + // If we're in the same topic, don't push the state + topicRegexp = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/; + newMatches = topicRegexp.exec(path); + newTopicId = newMatches ? newMatches[2] : null; + if (newTopicId) { + oldMatches = topicRegexp.exec(window.location.pathname); + if ((oldTopicId = oldMatches ? oldMatches[2] : void 0) && (oldTopicId === newTopicId)) { + Discourse.replaceState(path); + topicController = Discourse.__container__.lookup('controller:topic'); + opts = { + trackVisit: false + }; + if (newMatches[3]) { + opts.nearPost = newMatches[3]; } - } - }, - - openComposer: function(opts) { - // TODO, remove container link - var composer = Discourse.__container__.lookup('controller:composer'); - if (composer) composer.open(opts); - }, - - // Like router.route, but allow full urls rather than relative one - // HERE BE HACKS - uses the ember container for now until we can do this nicer. - routeTo: function(path) { - var newMatches, newTopicId, oldMatches, oldTopicId, opts, router, topicController, topicRegexp; - path = path.replace(/https?\:\/\/[^\/]+/, ''); - - // If we're in the same topic, don't push the state - topicRegexp = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/; - newMatches = topicRegexp.exec(path); - newTopicId = newMatches ? newMatches[2] : null; - if (newTopicId) { - oldMatches = topicRegexp.exec(window.location.pathname); - if ((oldTopicId = oldMatches ? oldMatches[2] : void 0) && (oldTopicId === newTopicId)) { - Discourse.replaceState(path); - topicController = Discourse.__container__.lookup('controller:topic'); - opts = { - trackVisit: false - }; - if (newMatches[3]) { - opts.nearPost = newMatches[3]; - } - topicController.get('content').loadPosts(opts); - return; - } - } - // 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. - router = Discourse.__container__.lookup('router:main'); - router.router.updateURL(path); - return router.handleURL(path); - }, - - // The classes of buttons to show on a post - postButtons: (function() { - return Discourse.SiteSettings.post_menu.split("|").map(function(i) { - return "" + (i.replace(/\+/, '').capitalize()); - }); - }).property('Discourse.SiteSettings.post_menu'), - - bindDOMEvents: function() { - var $html, hasTouch, - _this = this; - $html = jQuery('html'); - - /* Add the discourse touch event */ - hasTouch = false; - if ($html.hasClass('touch')) { - hasTouch = true; - } - if (Modernizr.prefixed("MaxTouchPoints", navigator) > 1) { - hasTouch = true; - } - if (hasTouch) { - $html.addClass('discourse-touch'); - this.touch = true; - this.hasTouch = true; - - $LAB.script(assetPath('defer/fastclick')) - .wait(function(){ - // work around jshint hating side-effects - // its just the way the FastClick api is - var ignore = new FastClick(document.body); - }); - - } else { - $html.addClass('discourse-no-touch'); - this.touch = false; - } - jQuery('#main').on('click.discourse', '[data-not-implemented=true]', function(e) { - e.preventDefault(); - alert(Em.String.i18n('not_implemented')); - return false; - }); - jQuery('#main').on('click.discourse', 'a', function(e) { - var $currentTarget, href; - if (e.isDefaultPrevented() || e.metaKey || e.ctrlKey) { - return; - } - $currentTarget = jQuery(e.currentTarget); - href = $currentTarget.attr('href'); - if (href === void 0) { - return; - } - if (href === '#') { - return; - } - if ($currentTarget.attr('target')) { - return; - } - if ($currentTarget.data('auto-route')) { - return; - } - if ($currentTarget.hasClass('lightbox')) { - return; - } - if (href.indexOf("mailto:") === 0) { - return; - } - if (href.match(/^http[s]?:\/\//i) && !href.match(new RegExp("^http:\\/\\/" + window.location.hostname, "i"))) { - return; - } - e.preventDefault(); - _this.routeTo(href); - return false; - }); - return jQuery(window).focus(function() { - _this.set('hasFocus', true); - return _this.set('notify', false); - }).blur(function() { - return _this.set('hasFocus', false); - }); - }, - logout: function() { - var username, - _this = this; - username = this.get('currentUser.username'); - Discourse.KeyValueStore.abandonLocal(); - return jQuery.ajax("/session/" + username, { - type: 'DELETE', - success: function(result) { - /* To keep lots of our variables unbound, we can handle a redirect on logging out. - */ - return window.location.reload(); - } - }); - }, - /* fancy probes in ember - */ - - insertProbes: function() { - var topLevel; - if (typeof console === "undefined" || console === null) { + topicController.get('content').loadPosts(opts); return; } - topLevel = function(fn, name) { - return window.probes.measure(fn, { - name: name, - before: function(data, owner, args) { - if (owner) { - return window.probes.clear(); - } - }, - after: function(data, owner, args) { - var ary, f, n, v, _ref; - if (owner && data.time > 10) { - f = function(name, data) { - if (data && data.count) { - return "" + name + " - " + data.count + " calls " + ((data.time + 0.0).toFixed(2)) + "ms"; - } - }; - if (console && console.group) { - console.group(f(name, data)); - } else { - console.log(""); - console.log(f(name, data)); + } + // 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. + router = Discourse.__container__.lookup('router:main'); + router.router.updateURL(path); + return router.handleURL(path); + }, + + // The classes of buttons to show on a post + postButtons: (function() { + return Discourse.SiteSettings.post_menu.split("|").map(function(i) { + return "" + (i.replace(/\+/, '').capitalize()); + }); + }).property('Discourse.SiteSettings.post_menu'), + + bindDOMEvents: function() { + var $html, hasTouch, + _this = this; + $html = $('html'); + + /* Add the discourse touch event */ + hasTouch = false; + if ($html.hasClass('touch')) { + hasTouch = true; + } + if (Modernizr.prefixed("MaxTouchPoints", navigator) > 1) { + hasTouch = true; + } + if (hasTouch) { + $html.addClass('discourse-touch'); + this.touch = true; + this.hasTouch = true; + + $LAB.script(assetPath('defer/fastclick')) + .wait(function(){ + // work around jshint hating side-effects + // its just the way the FastClick api is + var ignore = new FastClick(document.body); + }); + + } else { + $html.addClass('discourse-no-touch'); + this.touch = false; + } + $('#main').on('click.discourse', '[data-not-implemented=true]', function(e) { + e.preventDefault(); + alert(Em.String.i18n('not_implemented')); + return false; + }); + $('#main').on('click.discourse', 'a', function(e) { + var $currentTarget, href; + if (e.isDefaultPrevented() || e.metaKey || e.ctrlKey) { + return; + } + $currentTarget = $(e.currentTarget); + href = $currentTarget.attr('href'); + if (href === void 0) { + return; + } + if (href === '#') { + return; + } + if ($currentTarget.attr('target')) { + return; + } + if ($currentTarget.data('auto-route')) { + return; + } + if ($currentTarget.hasClass('lightbox')) { + return; + } + if (href.indexOf("mailto:") === 0) { + return; + } + if (href.match(/^http[s]?:\/\//i) && !href.match(new RegExp("^http:\\/\\/" + window.location.hostname, "i"))) { + return; + } + e.preventDefault(); + _this.routeTo(href); + return false; + }); + return $(window).focus(function() { + _this.set('hasFocus', true); + return _this.set('notify', false); + }).blur(function() { + return _this.set('hasFocus', false); + }); + }, + logout: function() { + var username, + _this = this; + username = this.get('currentUser.username'); + Discourse.KeyValueStore.abandonLocal(); + return jQuery.ajax("/session/" + username, { + type: 'DELETE', + success: function(result) { + /* To keep lots of our variables unbound, we can handle a redirect on logging out. + */ + return window.location.reload(); + } + }); + }, + /* fancy probes in ember + */ + + insertProbes: function() { + var topLevel; + if (typeof console === "undefined" || console === null) { + return; + } + topLevel = function(fn, name) { + return window.probes.measure(fn, { + name: name, + before: function(data, owner, args) { + if (owner) { + return window.probes.clear(); + } + }, + after: function(data, owner, args) { + var ary, f, n, v, _ref; + if (owner && data.time > 10) { + f = function(name, data) { + if (data && data.count) { + return "" + name + " - " + data.count + " calls " + ((data.time + 0.0).toFixed(2)) + "ms"; } - ary = []; - _ref = window.probes; - for (n in _ref) { - v = _ref[n]; - if (n === name || v.time < 1) { - continue; - } - ary.push({ - k: n, - v: v + }; + if (console && console.group) { + console.group(f(name, data)); + } else { + console.log(""); + console.log(f(name, data)); + } + ary = []; + _ref = window.probes; + for (n in _ref) { + v = _ref[n]; + if (n === name || v.time < 1) { + continue; + } + ary.push({ + k: n, + v: v + }); + } + ary.sortBy(function(item) { + if (item.v && item.v.time) { + return -item.v.time; + } else { + return 0; + } + }).each(function(item) { + var output = f("" + item.k, item.v); + if (output) { + return console.log(output); + } + }); + if (typeof console !== "undefined" && console !== null) { + if (typeof console.groupEnd === "function") { + console.groupEnd(); + } + } + return window.probes.clear(); + } + } + }); + }; + Ember.View.prototype.renderToBuffer = window.probes.measure(Ember.View.prototype.renderToBuffer, "renderToBuffer"); + Discourse.routeTo = topLevel(Discourse.routeTo, "Discourse.routeTo"); + Ember.run.end = topLevel(Ember.run.end, "Ember.run.end"); + }, + authenticationComplete: function(options) { + // TODO, how to dispatch this to the view without the container? + var loginView; + loginView = Discourse.__container__.lookup('controller:modal').get('currentView'); + return loginView.authenticationComplete(options); + }, + buildRoutes: function(builder) { + var oldBuilder; + oldBuilder = Discourse.routeBuilder; + Discourse.routeBuilder = function() { + if (oldBuilder) { + oldBuilder.call(this); + } + return builder.call(this); + }; + }, + start: function() { + this.bindDOMEvents(); + Discourse.SiteSettings = PreloadStore.getStatic('siteSettings'); + Discourse.MessageBus.start(); + Discourse.KeyValueStore.init("discourse_", Discourse.MessageBus); + Discourse.insertProbes(); + + // subscribe to any site customizations that are loaded + $('link.custom-css').each(function() { + var id, split, stylesheet, + _this = this; + split = this.href.split("/"); + id = split[split.length - 1].split(".css")[0]; + stylesheet = this; + return Discourse.MessageBus.subscribe("/file-change/" + id, function(data) { + var orig, sp; + if (!$(stylesheet).data('orig')) { + $(stylesheet).data('orig', stylesheet.href); + } + orig = $(stylesheet).data('orig'); + sp = orig.split(".css?"); + stylesheet.href = sp[0] + ".css?" + data; + }); + }); + $('header.custom').each(function() { + var header; + header = $(this); + return Discourse.MessageBus.subscribe("/header-change/" + ($(this).data('key')), function(data) { + return header.html(data); + }); + }); + + // possibly move this to dev only + return Discourse.MessageBus.subscribe("/file-change", function(data) { + Ember.TEMPLATES.empty = Handlebars.compile("
"); + return data.each(function(me) { + var js; + if (me === "refresh") { + return document.location.reload(true); + } else if (me.name.substr(-10) === "handlebars") { + js = me.name.replace(".handlebars", "").replace("app/assets/javascripts", "/assets"); + return $LAB.script(js + "?hash=" + me.hash).wait(function() { + var templateName; + templateName = js.replace(".js", "").replace("/assets/", ""); + return jQuery.each(Ember.View.views, function() { + var _this = this; + if (this.get('templateName') === templateName) { + this.set('templateName', 'empty'); + this.rerender(); + return Em.run.next(function() { + _this.set('templateName', templateName); + return _this.rerender(); }); } - ary.sortBy(function(item) { - if (item.v && item.v.time) { - return -item.v.time; - } else { - return 0; - } - }).each(function(item) { - var output = f("" + item.k, item.v); - if (output) { - return console.log(output); - } - }); - if (typeof console !== "undefined" && console !== null) { - if (typeof console.groupEnd === "function") { - console.groupEnd(); - } + }); + }); + } else { + return $('link').each(function() { + if (this.href.match(me.name) && me.hash) { + if (!$(this).data('orig')) { + $(this).data('orig', this.href); } - return window.probes.clear(); + this.href = $(this).data('orig') + "&hash=" + me.hash; } - } - }); - }; - Ember.View.prototype.renderToBuffer = window.probes.measure(Ember.View.prototype.renderToBuffer, "renderToBuffer"); - Discourse.routeTo = topLevel(Discourse.routeTo, "Discourse.routeTo"); - Ember.run.end = topLevel(Ember.run.end, "Ember.run.end"); - }, - authenticationComplete: function(options) { - // TODO, how to dispatch this to the view without the container? - var loginView; - loginView = Discourse.__container__.lookup('controller:modal').get('currentView'); - return loginView.authenticationComplete(options); - }, - buildRoutes: function(builder) { - var oldBuilder; - oldBuilder = Discourse.routeBuilder; - Discourse.routeBuilder = function() { - if (oldBuilder) { - oldBuilder.call(this); + }); } - return builder.call(this); - }; - }, - start: function() { - this.bindDOMEvents(); - Discourse.SiteSettings = PreloadStore.getStatic('siteSettings'); - Discourse.MessageBus.start(); - Discourse.KeyValueStore.init("discourse_", Discourse.MessageBus); - Discourse.insertProbes(); - - // subscribe to any site customizations that are loaded - jQuery('link.custom-css').each(function() { - var id, split, stylesheet, - _this = this; - split = this.href.split("/"); - id = split[split.length - 1].split(".css")[0]; - stylesheet = this; - return Discourse.MessageBus.subscribe("/file-change/" + id, function(data) { - var orig, sp; - if (!jQuery(stylesheet).data('orig')) { - jQuery(stylesheet).data('orig', stylesheet.href); - } - orig = jQuery(stylesheet).data('orig'); - sp = orig.split(".css?"); - stylesheet.href = sp[0] + ".css?" + data; - }); - }); - jQuery('header.custom').each(function() { - var header; - header = jQuery(this); - return Discourse.MessageBus.subscribe("/header-change/" + (jQuery(this).data('key')), function(data) { - return header.html(data); - }); }); + }); + } +}); - // possibly move this to dev only - return Discourse.MessageBus.subscribe("/file-change", function(data) { - Ember.TEMPLATES.empty = Handlebars.compile("
"); - return data.each(function(me) { - var js; - if (me === "refresh") { - return document.location.reload(true); - } else if (me.name.substr(-10) === "handlebars") { - js = me.name.replace(".handlebars", "").replace("app/assets/javascripts", "/assets"); - return $LAB.script(js + "?hash=" + me.hash).wait(function() { - var templateName; - templateName = js.replace(".js", "").replace("/assets/", ""); - return jQuery.each(Ember.View.views, function() { - var _this = this; - if (this.get('templateName') === templateName) { - this.set('templateName', 'empty'); - this.rerender(); - return Em.run.next(function() { - _this.set('templateName', templateName); - return _this.rerender(); - }); - } - }); - }); - } else { - return jQuery('link').each(function() { - if (this.href.match(me.name) && me.hash) { - if (!jQuery(this).data('orig')) { - jQuery(this).data('orig', this.href); - } - this.href = jQuery(this).data('orig') + "&hash=" + me.hash; - } - }); - } - }); - }); - } - }); +Discourse.Router = Discourse.Router.reopen({ + location: 'discourse_location' +}); - window.Discourse.Router = Discourse.Router.reopen({ - location: 'discourse_location' - }); +// since we have no jquery-rails these days, hook up csrf token +csrf_token = $('meta[name=csrf-token]').attr('content'); - // since we have no jquery-rails these days, hook up csrf token - csrf_token = jQuery('meta[name=csrf-token]').attr('content'); +jQuery.ajaxPrefilter(function(options, originalOptions, xhr) { + if (!options.crossDomain) { + xhr.setRequestHeader('X-CSRF-Token', csrf_token); + } +}); - jQuery.ajaxPrefilter(function(options, originalOptions, xhr) { - if (!options.crossDomain) { - xhr.setRequestHeader('X-CSRF-Token', csrf_token); - } - }); -}).call(this); diff --git a/app/assets/javascripts/discourse/components/autocomplete.js b/app/assets/javascripts/discourse/components/autocomplete.js index bd3a56054d0..70c8c29a0b2 100644 --- a/app/assets/javascripts/discourse/components/autocomplete.js +++ b/app/assets/javascripts/discourse/components/autocomplete.js @@ -1,313 +1,317 @@ -(function() { +/** + This is a jQuery plugin to support autocompleting values in our text fields. - (function($) { - var template; - template = null; - $.fn.autocomplete = function(options) { - var addInputSelectedItem, autocompleteOptions, closeAutocomplete, completeEnd, completeStart, completeTerm, div, height; - var inputSelectedItems, isInput, markSelected, me, oldClose, renderAutocomplete, selectedOption, updateAutoComplete, vals; - var width, wrap, _this = this; - if (this.length === 0) { - return; - } - if (options && options.cancel && this.data("closeAutocomplete")) { - this.data("closeAutocomplete")(); - return this; - } - if (this.length !== 1) { - alert("only supporting one matcher at the moment"); - } - autocompleteOptions = null; - selectedOption = null; - completeStart = null; - completeEnd = null; - me = this; - div = null; - /* input is handled differently - */ + @module $.fn.autocomplete +**/ +$.fn.autocomplete = function(options) { - isInput = this[0].tagName === "INPUT"; - inputSelectedItems = []; - addInputSelectedItem = function(item) { - var d, prev, transformed; - if (options.transformComplete) { - transformed = options.transformComplete(item); + var addInputSelectedItem, autocompleteOptions, closeAutocomplete, completeEnd, completeStart, completeTerm, div, height; + var inputSelectedItems, isInput, markSelected, me, oldClose, renderAutocomplete, selectedOption, updateAutoComplete, vals; + var width, wrap, _this = this; + + if (this.length === 0) return; + + if (options && options.cancel && this.data("closeAutocomplete")) { + this.data("closeAutocomplete")(); + return this; + } + if (this.length !== 1) { + alert("only supporting one matcher at the moment"); + } + autocompleteOptions = null; + selectedOption = null; + completeStart = null; + completeEnd = null; + me = this; + div = null; + + // input is handled differently + isInput = this[0].tagName === "INPUT"; + inputSelectedItems = []; + + addInputSelectedItem = function(item) { + var d, prev, transformed; + if (options.transformComplete) { + transformed = options.transformComplete(item); + } + d = $("
" + (transformed || item) + "
"); + prev = me.parent().find('.item:last'); + if (prev.length === 0) { + me.parent().prepend(d); + } else { + prev.after(d); + } + inputSelectedItems.push(item); + if (options.onChangeItems) { + options.onChangeItems(inputSelectedItems); + } + return d.find('a').click(function() { + closeAutocomplete(); + inputSelectedItems.splice(jQuery.inArray(item), 1); + $(this).parent().parent().remove(); + if (options.onChangeItems) { + return options.onChangeItems(inputSelectedItems); + } + }); + }; + + if (isInput) { + width = this.width(); + height = this.height(); + wrap = this.wrap("
").parent(); + wrap.width(width); + this.width(80); + this.attr('name', this.attr('name') + "-renamed"); + vals = this.val().split(","); + vals.each(function(x) { + if (x !== "") { + if (options.reverseTransform) { + x = options.reverseTransform(x); } - d = jQuery("
" + (transformed || item) + "
"); - prev = me.parent().find('.item:last'); - if (prev.length === 0) { - me.parent().prepend(d); - } else { - prev.after(d); - } - inputSelectedItems.push(item); - if (options.onChangeItems) { - options.onChangeItems(inputSelectedItems); - } - return d.find('a').click(function() { - closeAutocomplete(); - inputSelectedItems.splice(jQuery.inArray(item), 1); - jQuery(this).parent().parent().remove(); - if (options.onChangeItems) { - return options.onChangeItems(inputSelectedItems); - } - }); + return addInputSelectedItem(x); + } + }); + this.val(""); + completeStart = 0; + wrap.click(function() { + _this.focus(); + return true; + }); + } + + markSelected = function() { + var links; + links = div.find('li a'); + links.removeClass('selected'); + return $(links[selectedOption]).addClass('selected'); + }; + + renderAutocomplete = function() { + var borderTop, mePos, pos, ul; + if (div) { + div.hide().remove(); + } + if (autocompleteOptions.length === 0) { + return; + } + div = $(options.template({ + options: autocompleteOptions + })); + ul = div.find('ul'); + selectedOption = 0; + markSelected(); + ul.find('li').click(function() { + selectedOption = ul.find('li').index(this); + completeTerm(autocompleteOptions[selectedOption]); + return false; + }); + pos = null; + if (isInput) { + pos = { + left: 0, + top: 0 }; + } else { + pos = me.caretPosition({ + pos: completeStart, + key: options.key + }); + } + div.css({ + left: "-1000px" + }); + me.parent().append(div); + mePos = me.position(); + borderTop = parseInt(me.css('border-top-width'), 10) || 0; + return div.css({ + position: 'absolute', + top: (mePos.top + pos.top - div.height() + borderTop) + 'px', + left: (mePos.left + pos.left + 27) + 'px' + }); + }; + + updateAutoComplete = function(r) { + if (completeStart === null) return; + + autocompleteOptions = r; + if (!r || r.length === 0) { + return closeAutocomplete(); + } else { + return renderAutocomplete(); + } + }; + + closeAutocomplete = function() { + if (div) { + div.hide().remove(); + } + div = null; + completeStart = null; + autocompleteOptions = null; + }; + + // chain to allow multiples + oldClose = me.data("closeAutocomplete"); + me.data("closeAutocomplete", function() { + if (oldClose) { + oldClose(); + } + return closeAutocomplete(); + }); + + completeTerm = function(term) { + var text; + if (term) { if (isInput) { - width = this.width(); - height = this.height(); - wrap = this.wrap("
").parent(); - wrap.width(width); - this.width(80); - this.attr('name', this.attr('name') + "-renamed"); - vals = this.val().split(","); - vals.each(function(x) { - if (x !== "") { - if (options.reverseTransform) { - x = options.reverseTransform(x); - } - return addInputSelectedItem(x); - } - }); - this.val(""); - completeStart = 0; - wrap.click(function() { - _this.focus(); - return true; - }); + me.val(""); + addInputSelectedItem(term); + } else { + if (options.transformComplete) { + term = options.transformComplete(term); + } + text = me.val(); + text = text.substring(0, completeStart) + (options.key || "") + term + ' ' + text.substring(completeEnd + 1, text.length); + me.val(text); + Discourse.Utilities.setCaretPosition(me[0], completeStart + 1 + term.length); } - markSelected = function() { - var links; - links = div.find('li a'); - links.removeClass('selected'); - return jQuery(links[selectedOption]).addClass('selected'); - }; - renderAutocomplete = function() { - var borderTop, mePos, pos, ul; - if (div) { - div.hide().remove(); + } + return closeAutocomplete(); + }; + + $(this).keypress(function(e) { + var caretPosition, prevChar, term; + if (!options.key) { + return; + } + /* keep hunting backwards till you hit a + */ + + if (e.which === options.key.charCodeAt(0)) { + caretPosition = Discourse.Utilities.caretPosition(me[0]); + prevChar = me.val().charAt(caretPosition - 1); + if (!prevChar || /\s/.test(prevChar)) { + completeStart = completeEnd = caretPosition; + term = ""; + options.dataSource(term, updateAutoComplete); + } + } + }); + + return $(this).keydown(function(e) { + var c, caretPosition, i, initial, next, nextIsGood, prev, prevIsGood, stopFound, term, total, userToComplete; + if (!options.key) { + completeStart = 0; + } + if (e.which === 16) { + return; + } + if ((completeStart === null) && e.which === 8 && options.key) { + c = Discourse.Utilities.caretPosition(me[0]); + next = me[0].value[c]; + nextIsGood = next === void 0 || /\s/.test(next); + c -= 1; + initial = c; + prevIsGood = true; + while (prevIsGood && c >= 0) { + c -= 1; + prev = me[0].value[c]; + stopFound = prev === options.key; + if (stopFound) { + prev = me[0].value[c - 1]; + if (!prev || /\s/.test(prev)) { + completeStart = c; + caretPosition = completeEnd = initial; + term = me[0].value.substring(c + 1, initial); + options.dataSource(term, updateAutoComplete); + return true; + } } - if (autocompleteOptions.length === 0) { - return; - } - div = jQuery(options.template({ - options: autocompleteOptions - })); - ul = div.find('ul'); - selectedOption = 0; - markSelected(); - ul.find('li').click(function() { - selectedOption = ul.find('li').index(this); - completeTerm(autocompleteOptions[selectedOption]); - return false; - }); - pos = null; - if (isInput) { - pos = { - left: 0, - top: 0 - }; - } else { - pos = me.caretPosition({ - pos: completeStart, - key: options.key - }); - } - div.css({ - left: "-1000px" - }); - me.parent().append(div); - mePos = me.position(); - borderTop = parseInt(me.css('border-top-width'), 10) || 0; - return div.css({ - position: 'absolute', - top: (mePos.top + pos.top - div.height() + borderTop) + 'px', - left: (mePos.left + pos.left + 27) + 'px' - }); - }; - updateAutoComplete = function(r) { - if (completeStart === null) return; - - autocompleteOptions = r; - if (!r || r.length === 0) { - return closeAutocomplete(); - } else { - return renderAutocomplete(); - } - }; - closeAutocomplete = function() { - if (div) { - div.hide().remove(); - } - div = null; - completeStart = null; - autocompleteOptions = null; - }; - /* chain to allow multiples + prevIsGood = /[a-zA-Z\.]/.test(prev); + } + } + if (e.which === 27) { + if (completeStart !== null) { + closeAutocomplete(); + return false; + } + return true; + } + if (completeStart !== null) { + caretPosition = Discourse.Utilities.caretPosition(me[0]); + /* If we've backspaced past the beginning, cancel unless no key */ - oldClose = me.data("closeAutocomplete"); - me.data("closeAutocomplete", function() { - if (oldClose) { - oldClose(); - } - return closeAutocomplete(); - }); - completeTerm = function(term) { - var text; - if (term) { - if (isInput) { - me.val(""); - addInputSelectedItem(term); + if (caretPosition <= completeStart && options.key) { + closeAutocomplete(); + return false; + } + /* Keyboard codes! So 80's. + */ + + switch (e.which) { + case 13: + case 39: + case 9: + if (!autocompleteOptions) { + return true; + } + if (selectedOption >= 0 && (userToComplete = autocompleteOptions[selectedOption])) { + completeTerm(userToComplete); } else { - if (options.transformComplete) { - term = options.transformComplete(term); - } - text = me.val(); - text = text.substring(0, completeStart) + (options.key || "") + term + ' ' + text.substring(completeEnd + 1, text.length); - me.val(text); - Discourse.Utilities.setCaretPosition(me[0], completeStart + 1 + term.length); - } - } - return closeAutocomplete(); - }; - jQuery(this).keypress(function(e) { - var caretPosition, prevChar, term; - if (!options.key) { - return; - } - /* keep hunting backwards till you hit a - */ + /* We're cancelling it, really. + */ - if (e.which === options.key.charCodeAt(0)) { - caretPosition = Discourse.Utilities.caretPosition(me[0]); - prevChar = me.val().charAt(caretPosition - 1); - if (!prevChar || /\s/.test(prevChar)) { - completeStart = completeEnd = caretPosition; - term = ""; - options.dataSource(term, updateAutoComplete); + return true; } - } - }); - return jQuery(this).keydown(function(e) { - var c, caretPosition, i, initial, next, nextIsGood, prev, prevIsGood, stopFound, term, total, userToComplete; - if (!options.key) { - completeStart = 0; - } - if (e.which === 16) { - return; - } - if ((completeStart === null) && e.which === 8 && options.key) { - c = Discourse.Utilities.caretPosition(me[0]); - next = me[0].value[c]; - nextIsGood = next === void 0 || /\s/.test(next); - c -= 1; - initial = c; - prevIsGood = true; - while (prevIsGood && c >= 0) { - c -= 1; - prev = me[0].value[c]; - stopFound = prev === options.key; - if (stopFound) { - prev = me[0].value[c - 1]; - if (!prev || /\s/.test(prev)) { - completeStart = c; - caretPosition = completeEnd = initial; - term = me[0].value.substring(c + 1, initial); - options.dataSource(term, updateAutoComplete); - return true; + closeAutocomplete(); + return false; + case 38: + selectedOption = selectedOption - 1; + if (selectedOption < 0) { + selectedOption = 0; + } + markSelected(); + return false; + case 40: + total = autocompleteOptions.length; + selectedOption = selectedOption + 1; + if (selectedOption >= total) { + selectedOption = total - 1; + } + if (selectedOption < 0) { + selectedOption = 0; + } + markSelected(); + return false; + default: + /* otherwise they're typing - let's search for it! + */ + + completeEnd = caretPosition; + if (e.which === 8) { + caretPosition--; + } + if (caretPosition < 0) { + closeAutocomplete(); + if (isInput) { + i = wrap.find('a:last'); + if (i) { + i.click(); } } - prevIsGood = /[a-zA-Z\.]/.test(prev); - } - } - if (e.which === 27) { - if (completeStart !== null) { - closeAutocomplete(); return false; } + term = me.val().substring(completeStart + (options.key ? 1 : 0), caretPosition); + if (e.which > 48 && e.which < 90) { + term += String.fromCharCode(e.which); + } else { + if (e.which !== 8) { + term += ","; + } + } + options.dataSource(term, updateAutoComplete); return true; - } - if (completeStart !== null) { - caretPosition = Discourse.Utilities.caretPosition(me[0]); - /* If we've backspaced past the beginning, cancel unless no key - */ - - if (caretPosition <= completeStart && options.key) { - closeAutocomplete(); - return false; - } - /* Keyboard codes! So 80's. - */ - - switch (e.which) { - case 13: - case 39: - case 9: - if (!autocompleteOptions) { - return true; - } - if (selectedOption >= 0 && (userToComplete = autocompleteOptions[selectedOption])) { - completeTerm(userToComplete); - } else { - /* We're cancelling it, really. - */ - - return true; - } - closeAutocomplete(); - return false; - case 38: - selectedOption = selectedOption - 1; - if (selectedOption < 0) { - selectedOption = 0; - } - markSelected(); - return false; - case 40: - total = autocompleteOptions.length; - selectedOption = selectedOption + 1; - if (selectedOption >= total) { - selectedOption = total - 1; - } - if (selectedOption < 0) { - selectedOption = 0; - } - markSelected(); - return false; - default: - /* otherwise they're typing - let's search for it! - */ - - completeEnd = caretPosition; - if (e.which === 8) { - caretPosition--; - } - if (caretPosition < 0) { - closeAutocomplete(); - if (isInput) { - i = wrap.find('a:last'); - if (i) { - i.click(); - } - } - return false; - } - term = me.val().substring(completeStart + (options.key ? 1 : 0), caretPosition); - if (e.which > 48 && e.which < 90) { - term += String.fromCharCode(e.which); - } else { - if (e.which !== 8) { - term += ","; - } - } - options.dataSource(term, updateAutoComplete); - return true; - } - } - }); - }; - return $.fn.autocomplete; - })(jQuery); - -}).call(this); + } + } + }); +}; diff --git a/app/assets/javascripts/discourse/components/bbcode.js b/app/assets/javascripts/discourse/components/bbcode.js index eff4240707e..dd474985d01 100644 --- a/app/assets/javascripts/discourse/components/bbcode.js +++ b/app/assets/javascripts/discourse/components/bbcode.js @@ -1,222 +1,193 @@ /*global HANDLEBARS_TEMPLATES:true*/ -(function() { +/** + Support for BBCode rendering - Discourse.BBCode = { - QUOTE_REGEXP: /\[quote=([^\]]*)\]([\s\S]*?)\[\/quote\]/im, - /* Define our replacers - */ + @class BBCode + @namespace Discourse + @module Discourse +**/ +Discourse.BBCode = { - replacers: { - base: { - withoutArgs: { - "ol": function(_, content) { - return "
    " + content + "
"; - }, - "li": function(_, content) { - return "
  • " + content + "
    • "; - }, - "ul": function(_, content) { - return "
      " + content + "
    "; - }, - "code": function(_, content) { - return "
    " + content + "
    "; - }, - "url": function(_, url) { - return "" + url + ""; - }, - "email": function(_, address) { - return "" + address + ""; - }, - "img": function(_, src) { - return ""; - } - }, - withArgs: { - "url": function(_, href, title) { - return "" + title + ""; - }, - "email": function(_, address, title) { - return "" + title + ""; - }, - "color": function(_, color, content) { - if (!/^(\#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?)|(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|purple|red|silver|teal|white|yellow)$/.test(color)) { - return content; - } - return "" + content + ""; + QUOTE_REGEXP: /\[quote=([^\]]*)\]([\s\S]*?)\[\/quote\]/im, + + // Define our replacers + replacers: { + base: { + withoutArgs: { + "ol": function(_, content) { return "
      " + content + "
    "; }, + "li": function(_, content) { return "
  • " + content + "
    • "; }, + "ul": function(_, content) { return "
      " + content + "
    "; }, + "code": function(_, content) { return "
    " + content + "
    "; }, + "url": function(_, url) { return "" + url + ""; }, + "email": function(_, address) { return "" + address + ""; }, + "img": function(_, src) { return ""; } + }, + withArgs: { + "url": function(_, href, title) { return "" + title + ""; }, + "email": function(_, address, title) { return "" + title + ""; }, + "color": function(_, color, content) { + if (!/^(\#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?)|(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|purple|red|silver|teal|white|yellow)$/.test(color)) { + return content; } + return "" + content + ""; + } + } + }, + + // For HTML emails + email: { + withoutArgs: { + "b": function(_, content) { return "" + content + ""; }, + "i": function(_, content) { return "" + content + ""; }, + "u": function(_, content) { return "" + content + ""; }, + "s": function(_, content) { return "" + content + ""; }, + "spoiler": function(_, content) { return "" + content + ""; } + }, + withArgs: { + "size": function(_, size, content) { + return "" + content + ""; + } + } + }, + + // For sane environments that support CSS + "default": { + withoutArgs: { + "b": function(_, content) { return "" + content + ""; }, + "i": function(_, content) { return "" + content + ""; }, + "u": function(_, content) { return "" + content + ""; }, + "s": function(_, content) { return "" + content + ""; }, + "spoiler": function(_, content) { return "" + content + ""; } }, - /* For HTML emails - */ - - email: { - withoutArgs: { - "b": function(_, content) { - return "" + content + ""; - }, - "i": function(_, content) { - return "" + content + ""; - }, - "u": function(_, content) { - return "" + content + ""; - }, - "s": function(_, content) { - return "" + content + ""; - }, - "spoiler": function(_, content) { - return "" + content + ""; - } - }, - withArgs: { - "size": function(_, size, content) { - return "" + content + ""; - } - } - }, - /* For sane environments that support CSS - */ - - "default": { - withoutArgs: { - "b": function(_, content) { - return "" + content + ""; - }, - "i": function(_, content) { - return "" + content + ""; - }, - "u": function(_, content) { - return "" + content + ""; - }, - "s": function(_, content) { - return "" + content + ""; - }, - "spoiler": function(_, content) { - return "" + content + ""; - } - }, - withArgs: { - "size": function(_, size, content) { - return "" + content + ""; - } + withArgs: { + "size": function(_, size, content) { + return "" + content + ""; } } - }, - - /* Apply a particular set of replacers */ - apply: function(text, environment) { - var replacer; - replacer = Discourse.BBCode.parsedReplacers()[environment]; - - replacer.forEach(function(r) { - text = text.replace(r.regexp, r.fn); - }); - return text; - }, - - parsedReplacers: function() { - var result; - if (this.parsed) { - return this.parsed; - } - result = {}; - Object.keys(Discourse.BBCode.replacers, function(name, rules) { - var parsed; - parsed = result[name] = []; - Object.keys(Object.merge(Discourse.BBCode.replacers.base.withoutArgs, rules.withoutArgs), function(tag, val) { - return parsed.push({ - regexp: new RegExp("\\[" + tag + "\\]([\\s\\S]*?)\\[\\/" + tag + "\\]", "igm"), - fn: val - }); - }); - return Object.keys(Object.merge(Discourse.BBCode.replacers.base.withArgs, rules.withArgs), function(tag, val) { - return parsed.push({ - regexp: new RegExp("\\[" + tag + "=?(.+?)\\]([\\s\\S]*?)\\[\\/" + tag + "\\]", "igm"), - fn: val - }); - }); - }); - this.parsed = result; - return this.parsed; - }, - - buildQuoteBBCode: function(post, contents) { - var contents_hashed, result, sansQuotes, stripped, stripped_hashed, tmp; - if (!contents) contents = ""; - - sansQuotes = contents.replace(this.QUOTE_REGEXP, '').trim(); - if (sansQuotes.length === 0) return ""; - - /* Strip the HTML from cooked */ - tmp = document.createElement('div'); - tmp.innerHTML = post.get('cooked'); - stripped = tmp.textContent || tmp.innerText; - - /* - Let's remove any non alphanumeric characters as a kind of hash. Yes it's - not accurate but it should work almost every time we need it to. It would be unlikely - that the user would quote another post that matches in exactly this way. - */ - stripped_hashed = stripped.replace(/[^a-zA-Z0-9]/g, ''); - contents_hashed = contents.replace(/[^a-zA-Z0-9]/g, ''); - result = "[quote=\"" + (post.get('username')) + ", post:" + (post.get('post_number')) + ", topic:" + (post.get('topic_id')); - - /* If the quote is the full message, attribute it as such */ - if (stripped_hashed === contents_hashed) { - result += ", full:true"; - } - result += "\"]\n" + sansQuotes + "\n[/quote]\n\n"; - return result; - }, - - formatQuote: function(text, opts) { - - /* Replace quotes with appropriate markup */ - var args, matches, params, paramsSplit, paramsString, templateName, username; - while (matches = this.QUOTE_REGEXP.exec(text)) { - paramsString = matches[1]; - paramsString = paramsString.replace(/\"/g, ''); - paramsSplit = paramsString.split(/\, */); - params = []; - paramsSplit.each(function(p, i) { - var assignment; - if (i > 0) { - assignment = p.split(':'); - if (assignment[0] && assignment[1]) { - return params.push({ - key: assignment[0], - value: assignment[1].trim() - }); - } - } - }); - username = paramsSplit[0]; - - /* Arguments for formatting */ - args = { - username: username, - params: params, - quote: matches[2].trim(), - avatarImg: opts.lookupAvatar ? opts.lookupAvatar(username) : void 0 - }; - templateName = 'quote'; - if (opts && opts.environment) { - templateName = "quote_" + opts.environment; - } - text = text.replace(matches[0], "

    " + HANDLEBARS_TEMPLATES[templateName](args) + "

    "); - } - return text; - }, - format: function(text, opts) { - var environment; - if (opts && opts.environment) environment = opts.environment; - if (!environment) environment = 'default'; - - text = Discourse.BBCode.apply(text, environment); - // Add quotes - text = Discourse.BBCode.formatQuote(text, opts); - return text; } - }; + }, -}).call(this); + // Apply a particular set of replacers + apply: function(text, environment) { + var replacer; + replacer = Discourse.BBCode.parsedReplacers()[environment]; + + replacer.forEach(function(r) { + text = text.replace(r.regexp, r.fn); + }); + return text; + }, + + parsedReplacers: function() { + var result; + if (this.parsed) return this.parsed; + + result = {}; + Object.keys(Discourse.BBCode.replacers, function(name, rules) { + var parsed; + parsed = result[name] = []; + Object.keys(Object.merge(Discourse.BBCode.replacers.base.withoutArgs, rules.withoutArgs), function(tag, val) { + return parsed.push({ + regexp: new RegExp("\\[" + tag + "\\]([\\s\\S]*?)\\[\\/" + tag + "\\]", "igm"), + fn: val + }); + }); + return Object.keys(Object.merge(Discourse.BBCode.replacers.base.withArgs, rules.withArgs), function(tag, val) { + return parsed.push({ + regexp: new RegExp("\\[" + tag + "=?(.+?)\\]([\\s\\S]*?)\\[\\/" + tag + "\\]", "igm"), + fn: val + }); + }); + }); + this.parsed = result; + return this.parsed; + }, + + buildQuoteBBCode: function(post, contents) { + var contents_hashed, result, sansQuotes, stripped, stripped_hashed, tmp; + if (!contents) contents = ""; + + sansQuotes = contents.replace(this.QUOTE_REGEXP, '').trim(); + if (sansQuotes.length === 0) return ""; + + /* Strip the HTML from cooked */ + tmp = document.createElement('div'); + tmp.innerHTML = post.get('cooked'); + stripped = tmp.textContent || tmp.innerText; + + /* + Let's remove any non alphanumeric characters as a kind of hash. Yes it's + not accurate but it should work almost every time we need it to. It would be unlikely + that the user would quote another post that matches in exactly this way. + */ + stripped_hashed = stripped.replace(/[^a-zA-Z0-9]/g, ''); + contents_hashed = contents.replace(/[^a-zA-Z0-9]/g, ''); + result = "[quote=\"" + (post.get('username')) + ", post:" + (post.get('post_number')) + ", topic:" + (post.get('topic_id')); + + /* If the quote is the full message, attribute it as such */ + if (stripped_hashed === contents_hashed) { + result += ", full:true"; + } + result += "\"]\n" + sansQuotes + "\n[/quote]\n\n"; + return result; + }, + + formatQuote: function(text, opts) { + + /* Replace quotes with appropriate markup */ + var args, matches, params, paramsSplit, paramsString, templateName, username; + while (matches = this.QUOTE_REGEXP.exec(text)) { + paramsString = matches[1]; + paramsString = paramsString.replace(/\"/g, ''); + paramsSplit = paramsString.split(/\, */); + params = []; + paramsSplit.each(function(p, i) { + var assignment; + if (i > 0) { + assignment = p.split(':'); + if (assignment[0] && assignment[1]) { + return params.push({ + key: assignment[0], + value: assignment[1].trim() + }); + } + } + }); + username = paramsSplit[0]; + + /* Arguments for formatting */ + args = { + username: username, + params: params, + quote: matches[2].trim(), + avatarImg: opts.lookupAvatar ? opts.lookupAvatar(username) : void 0 + }; + templateName = 'quote'; + if (opts && opts.environment) { + templateName = "quote_" + opts.environment; + } + text = text.replace(matches[0], "

    " + HANDLEBARS_TEMPLATES[templateName](args) + "

    "); + } + return text; + }, + + /** + Format a text string using BBCode + + @method format + @param {String} text The text we want to format + @param {Object} opts Rendering options + **/ + format: function(text, opts) { + var environment; + if (opts && opts.environment) environment = opts.environment; + if (!environment) environment = 'default'; + + text = Discourse.BBCode.apply(text, environment); + // Add quotes + text = Discourse.BBCode.formatQuote(text, opts); + return text; + } +}; \ No newline at end of file diff --git a/app/assets/javascripts/discourse/components/caret_position.js b/app/assets/javascripts/discourse/components/caret_position.js index 5081d1f30e5..4bdb9b316ab 100644 --- a/app/assets/javascripts/discourse/components/caret_position.js +++ b/app/assets/javascripts/discourse/components/caret_position.js @@ -1,135 +1,134 @@ +// http://stackoverflow.com/questions/263743/how-to-get-caret-position-in-textarea +var clone, getCaret; +getCaret = function(el) { + var r, rc, re; + if (el.selectionStart) { + return el.selectionStart; + } else if (document.selection) { + el.focus(); + r = document.selection.createRange(); + if (!r) return 0; + re = el.createTextRange(); + rc = re.duplicate(); + re.moveToBookmark(r.getBookmark()); + rc.setEndPoint("EndToStart", re); + return rc.text.length; + } + return 0; +}; -/* caret position in textarea ... very hacky ... sorry -*/ +clone = null; +/** + This is a jQuery plugin to retrieve the caret position in a textarea -(function() { + @module $.fn.caretPosition +**/ +$.fn.caretPosition = function(options) { + var after, before, getStyles, guard, html, important, insertSpaceAfterBefore, letter, makeCursor, p, pPos, pos, span, styles, textarea, val; + if (clone) { + clone.remove(); + } + span = $("#pos span"); + textarea = $(this); - (function($) { - /* http://stackoverflow.com/questions/263743/how-to-get-caret-position-in-textarea - */ + getStyles = function(el, prop) { + if (el.currentStyle) { + return el.currentStyle; + } else { + return document.defaultView.getComputedStyle(el, ""); + } + }; - var clone, getCaret; - getCaret = function(el) { - var r, rc, re; - if (el.selectionStart) { - return el.selectionStart; - } else if (document.selection) { - el.focus(); - r = document.selection.createRange(); - if (!r) return 0; - re = el.createTextRange(); - rc = re.duplicate(); - re.moveToBookmark(r.getBookmark()); - rc.setEndPoint("EndToStart", re); - return rc.text.length; - } - return 0; - }; - clone = null; - $.fn.caretPosition = function(options) { - var after, before, getStyles, guard, html, important, insertSpaceAfterBefore, letter, makeCursor, p, pPos, pos, span, styles, textarea, val; - if (clone) { - clone.remove(); - } - span = jQuery("#pos span"); - textarea = jQuery(this); - getStyles = function(el, prop) { - if (el.currentStyle) { - return el.currentStyle; - } else { - return document.defaultView.getComputedStyle(el, ""); - } - }; - styles = getStyles(textarea[0]); - clone = jQuery("

    ").appendTo("body"); - p = clone.find("p"); - clone.width(textarea.width()); - clone.height(textarea.height()); - important = function(prop) { - return styles.getPropertyValue(prop); - }; - clone.css({ - border: "1px solid black", - padding: important("padding"), - resize: important("resize"), - "max-height": textarea.height() + "px", - "overflow-y": "auto", - "word-wrap": "break-word", - position: "absolute", - left: "-7000px" - }); - p.css({ - margin: 0, - padding: 0, - "word-wrap": "break-word", - "letter-spacing": important("letter-spacing"), - "font-family": important("font-family"), - "font-size": important("font-size"), - "line-height": important("line-height") - }); - before = void 0; - after = void 0; - pos = options && (options.pos || options.pos === 0) ? options.pos : getCaret(textarea[0]); - val = textarea.val().replace("\r", ""); - if (options && options.key) { - val = val.substring(0, pos) + options.key + val.substring(pos); - } - before = pos - 1; - after = pos; - insertSpaceAfterBefore = false; - /* if before and after are \n insert a space - */ + styles = getStyles(textarea[0]); + clone = $("

    ").appendTo("body"); + p = clone.find("p"); + clone.width(textarea.width()); + clone.height(textarea.height()); - if (val[before] === "\n" && val[after] === "\n") { - insertSpaceAfterBefore = true; - } - guard = function(v) { - var buf; - buf = v.replace(//g, ">"); - buf = buf.replace(/[ ]/g, "​ ​"); - return buf.replace(/\n/g, "
    "); - }; - makeCursor = function(pos, klass, color) { - var l; - l = val.substring(pos, pos + 1); - if (l === "\n") { - return "
    "; - } - return "" + guard(l) + ""; - }; - html = ""; - if (before >= 0) { - html += guard(val.substring(0, pos - 1)) + makeCursor(before, "before", "#d0ffff"); - if (insertSpaceAfterBefore) { - html += makeCursor(0, "post-before", "#d0ffff"); - } - } - if (after >= 0) { - html += makeCursor(after, "after", "#ffd0ff"); - if (after - 1 < val.length) { - html += guard(val.substring(after + 1)); - } - } - p.html(html); - clone.scrollTop(textarea.scrollTop()); - letter = p.find("span:first"); - pos = letter.offset(); - if (letter.hasClass("before")) { - pos.left = pos.left + letter.width(); - } - pPos = p.offset(); - return { - /*clone.hide().remove() - */ + important = function(prop) { + return styles.getPropertyValue(prop); + }; - left: pos.left - pPos.left, - top: (pos.top - pPos.top) - clone.scrollTop() - }; - }; - return $.fn.caretPosition; - - })(jQuery); + clone.css({ + border: "1px solid black", + padding: important("padding"), + resize: important("resize"), + "max-height": textarea.height() + "px", + "overflow-y": "auto", + "word-wrap": "break-word", + position: "absolute", + left: "-7000px" + }); -}).call(this); + p.css({ + margin: 0, + padding: 0, + "word-wrap": "break-word", + "letter-spacing": important("letter-spacing"), + "font-family": important("font-family"), + "font-size": important("font-size"), + "line-height": important("line-height") + }); + + before = void 0; + after = void 0; + pos = options && (options.pos || options.pos === 0) ? options.pos : getCaret(textarea[0]); + val = textarea.val().replace("\r", ""); + if (options && options.key) { + val = val.substring(0, pos) + options.key + val.substring(pos); + } + before = pos - 1; + after = pos; + insertSpaceAfterBefore = false; + + // if before and after are \n insert a space + if (val[before] === "\n" && val[after] === "\n") { + insertSpaceAfterBefore = true; + } + + guard = function(v) { + var buf; + buf = v.replace(//g, ">"); + buf = buf.replace(/[ ]/g, "​ ​"); + return buf.replace(/\n/g, "
    "); + }; + + makeCursor = function(pos, klass, color) { + var l; + l = val.substring(pos, pos + 1); + if (l === "\n") return "
    "; + return "" + guard(l) + ""; + }; + + html = ""; + if (before >= 0) { + html += guard(val.substring(0, pos - 1)) + makeCursor(before, "before", "#d0ffff"); + if (insertSpaceAfterBefore) { + html += makeCursor(0, "post-before", "#d0ffff"); + } + } + + if (after >= 0) { + html += makeCursor(after, "after", "#ffd0ff"); + if (after - 1 < val.length) { + html += guard(val.substring(after + 1)); + } + } + + p.html(html); + clone.scrollTop(textarea.scrollTop()); + letter = p.find("span:first"); + pos = letter.offset(); + if (letter.hasClass("before")) { + pos.left = pos.left + letter.width(); + } + + pPos = p.offset(); + return { + left: pos.left - pPos.left, + top: (pos.top - pPos.top) - clone.scrollTop() + }; + +}; diff --git a/app/assets/javascripts/discourse/components/click_track.js b/app/assets/javascripts/discourse/components/click_track.js index e3b8d669e06..7f2e66cdf07 100644 --- a/app/assets/javascripts/discourse/components/click_track.js +++ b/app/assets/javascripts/discourse/components/click_track.js @@ -1,108 +1,101 @@ +/** + Used for tracking when the user clicks on a link -/* We use this object to keep track of click counts. -*/ + @class ClickTrack + @namespace Discourse + @module Discourse +**/ +Discourse.ClickTrack = { + /** + Track a click on a link -(function() { + @method trackClick + @param {jQuery.Event} e The click event that occurred + **/ + trackClick: function(e) { + var $a, $article, $badge, count, destination, href, ownLink, postId, topicId, trackingUrl, userId; + $a = $(e.currentTarget); + if ($a.hasClass('lightbox')) { + return; + } + e.preventDefault(); - window.Discourse.ClickTrack = { - /* Pass the event of the click here and we'll do the magic! - */ + // We don't track clicks on quote back buttons + if ($a.hasClass('back') || $a.hasClass('quote-other-topic')) return true; - trackClick: function(e) { - var $a, $article, $badge, count, destination, href, ownLink, postId, topicId, trackingUrl, userId; - $a = jQuery(e.currentTarget); - if ($a.hasClass('lightbox')) { - return; + // Remove the href, put it as a data attribute + if (!$a.data('href')) { + $a.addClass('no-href'); + $a.data('href', $a.attr('href')); + $a.attr('href', null); + // Don't route to this URL + $a.data('auto-route', true); + } + + href = $a.data('href'); + $article = $a.closest('article'); + postId = $article.data('post-id'); + topicId = $('#topic').data('topic-id'); + userId = $a.data('user-id'); + if (!userId) { + userId = $article.data('user-id'); + } + ownLink = userId && (userId === Discourse.get('currentUser.id')); + + // Build a Redirect URL + trackingUrl = "/clicks/track?url=" + encodeURIComponent(href); + if (postId && (!$a.data('ignore-post-id'))) { + trackingUrl += "&post_id=" + encodeURI(postId); + } + if (topicId) { + trackingUrl += "&topic_id=" + encodeURI(topicId); + } + + // Update badge clicks unless it's our own + if (!ownLink) { + $badge = $('span.badge', $a); + if ($badge.length === 1) { + count = parseInt($badge.html(), 10); + $badge.html(count + 1); } - e.preventDefault(); - /* We don't track clicks on quote back buttons - */ + } - if ($a.hasClass('back') || $a.hasClass('quote-other-topic')) { - return true; - } - /* Remove the href, put it as a data attribute - */ + // If they right clicked, change the destination href + if (e.which === 3) { + destination = Discourse.SiteSettings.track_external_right_clicks ? trackingUrl : href; + $a.attr('href', destination); + return true; + } - if (!$a.data('href')) { - $a.addClass('no-href'); - $a.data('href', $a.attr('href')); - $a.attr('href', null); - /* Don't route to this URL - */ - - $a.data('auto-route', true); - } - href = $a.data('href'); - $article = $a.closest('article'); - postId = $article.data('post-id'); - topicId = jQuery('#topic').data('topic-id'); - userId = $a.data('user-id'); - if (!userId) { - userId = $article.data('user-id'); - } - ownLink = userId && (userId === Discourse.get('currentUser.id')); - /* Build a Redirect URL - */ - - trackingUrl = "/clicks/track?url=" + encodeURIComponent(href); - if (postId && (!$a.data('ignore-post-id'))) { - trackingUrl += "&post_id=" + encodeURI(postId); - } - if (topicId) { - trackingUrl += "&topic_id=" + encodeURI(topicId); - } - /* Update badge clicks unless it's our own - */ - - if (!ownLink) { - $badge = jQuery('span.badge', $a); - if ($badge.length === 1) { - count = parseInt($badge.html(), 10); - $badge.html(count + 1); - } - } - /* If they right clicked, change the destination href - */ - - if (e.which === 3) { - destination = Discourse.SiteSettings.track_external_right_clicks ? trackingUrl : href; - $a.attr('href', destination); - return true; - } - /* if they want to open in a new tab, do an AJAX request - */ - - if (e.metaKey || e.ctrlKey || e.which === 2) { - jQuery.get("/clicks/track", { - url: href, - post_id: postId, - topic_id: topicId, - redirect: false - }); - window.open(href, '_blank'); - return false; - } - /* If we're on the same site, use the router and track via AJAX - */ - - if (href.indexOf(window.location.origin) === 0) { - jQuery.get("/clicks/track", { - url: href, - post_id: postId, - topic_id: topicId, - redirect: false - }); - Discourse.routeTo(href); - return false; - } - /* Otherwise, use a custom URL with a redirect - */ - - window.location = trackingUrl; + // if they want to open in a new tab, do an AJAX request + if (e.metaKey || e.ctrlKey || e.which === 2) { + jQuery.get("/clicks/track", { + url: href, + post_id: postId, + topic_id: topicId, + redirect: false + }); + window.open(href, '_blank'); return false; } - }; -}).call(this); + // If we're on the same site, use the router and track via AJAX + if (href.indexOf(window.location.origin) === 0) { + jQuery.get("/clicks/track", { + url: href, + post_id: postId, + topic_id: topicId, + redirect: false + }); + Discourse.routeTo(href); + return false; + } + + // Otherwise, use a custom URL with a redirect + window.location = trackingUrl; + return false; + } +}; + + diff --git a/app/assets/javascripts/discourse/components/debounce.js b/app/assets/javascripts/discourse/components/debounce.js index 00163158150..2c081cf4825 100644 --- a/app/assets/javascripts/discourse/components/debounce.js +++ b/app/assets/javascripts/discourse/components/debounce.js @@ -1,4 +1,14 @@ -window.Discourse.debounce = function(func, wait, trickle) { +/** + Debounce a Javascript function. This means if it's called many times in a time limit it + should only be executed once. + + @method debounce + @module Discourse + @param {function} func The function to debounce + @param {Numbers} wait how long to wait + @param {Boolean} trickle +**/ +Discourse.debounce = function(func, wait, trickle) { var timeout; timeout = null; @@ -12,7 +22,7 @@ window.Discourse.debounce = function(func, wait, trickle) { }; if (timeout && trickle) { - /* already queued, let it through */ + // already queued, let it through return; } diff --git a/app/assets/javascripts/discourse/components/discourse_text_field.js b/app/assets/javascripts/discourse/components/discourse_text_field.js deleted file mode 100644 index 7e2a0b7061a..00000000000 --- a/app/assets/javascripts/discourse/components/discourse_text_field.js +++ /dev/null @@ -1,10 +0,0 @@ -(function() { - - Discourse.TextField = Ember.TextField.extend({ - attributeBindings: ['autocorrect', 'autocapitalize'], - placeholder: (function() { - return Em.String.i18n(this.get('placeholderKey')); - }).property('placeholderKey') - }); - -}).call(this); diff --git a/app/assets/javascripts/discourse/components/div_resizer.js b/app/assets/javascripts/discourse/components/div_resizer.js index 823e04c2719..fbcca76beb8 100644 --- a/app/assets/javascripts/discourse/components/div_resizer.js +++ b/app/assets/javascripts/discourse/components/div_resizer.js @@ -1,92 +1,91 @@ +/** + This is a jQuery plugin to support resizing text areas. -/*based off text area resizer by Ryan O'Dell : http://plugins.jquery.com/misc/textarea.js -*/ + Originally based off text area resizer by Ryan O'Dell : http://plugins.jquery.com/misc/textarea.js + @module $.fn.DivResizer +**/ -(function() { +var div, endDrag, grip, lastMousePos, min, mousePosition, originalDivHeight, originalPos, performDrag, startDrag, wrappedEndDrag, wrappedPerformDrag; +div = void 0; +originalPos = void 0; +originalDivHeight = void 0; +lastMousePos = 0; +min = 230; +grip = void 0; +wrappedEndDrag = void 0; +wrappedPerformDrag = void 0; - (function($) { - var div, endDrag, grip, lastMousePos, min, mousePosition, originalDivHeight, originalPos, performDrag, startDrag, wrappedEndDrag, wrappedPerformDrag; - div = void 0; - originalPos = void 0; - originalDivHeight = void 0; - lastMousePos = 0; - min = 230; - grip = void 0; - wrappedEndDrag = void 0; - wrappedPerformDrag = void 0; - startDrag = function(e, opts) { - div = jQuery(e.data.el); - div.addClass('clear-transitions'); - div.blur(); - lastMousePos = mousePosition(e).y; - originalPos = lastMousePos; - originalDivHeight = div.height(); - wrappedPerformDrag = (function() { - return function(e) { - return performDrag(e, opts); - }; - })(); - wrappedEndDrag = (function() { - return function(e) { - return endDrag(e, opts); - }; - })(); - jQuery(document).mousemove(wrappedPerformDrag).mouseup(wrappedEndDrag); - return false; +startDrag = function(e, opts) { + div = $(e.data.el); + div.addClass('clear-transitions'); + div.blur(); + lastMousePos = mousePosition(e).y; + originalPos = lastMousePos; + originalDivHeight = div.height(); + wrappedPerformDrag = (function() { + return function(e) { + return performDrag(e, opts); }; - performDrag = function(e, opts) { - var size, sizePx, thisMousePos; - thisMousePos = mousePosition(e).y; - size = originalDivHeight + (originalPos - thisMousePos); - lastMousePos = thisMousePos; - size = Math.min(size, jQuery(window).height()); - size = Math.max(min, size); - sizePx = size + "px"; - if (typeof opts.onDrag === "function") { - opts.onDrag(sizePx); - } - div.height(sizePx); - if (size < min) { - endDrag(e, opts); - } - return false; + })(); + wrappedEndDrag = (function() { + return function(e) { + return endDrag(e, opts); }; - endDrag = function(e, opts) { - jQuery(document).unbind("mousemove", wrappedPerformDrag).unbind("mouseup", wrappedEndDrag); - div.removeClass('clear-transitions'); - div.focus(); - if (typeof opts.resize === "function") { - opts.resize(); - } - div = null; - }; - mousePosition = function(e) { - return { - x: e.clientX + document.documentElement.scrollLeft, - y: e.clientY + document.documentElement.scrollTop + })(); + $(document).mousemove(wrappedPerformDrag).mouseup(wrappedEndDrag); + return false; +}; + +performDrag = function(e, opts) { + var size, sizePx, thisMousePos; + thisMousePos = mousePosition(e).y; + size = originalDivHeight + (originalPos - thisMousePos); + lastMousePos = thisMousePos; + size = Math.min(size, $(window).height()); + size = Math.max(min, size); + sizePx = size + "px"; + if (typeof opts.onDrag === "function") { + opts.onDrag(sizePx); + } + div.height(sizePx); + if (size < min) { + endDrag(e, opts); + } + return false; +}; + +endDrag = function(e, opts) { + $(document).unbind("mousemove", wrappedPerformDrag).unbind("mouseup", wrappedEndDrag); + div.removeClass('clear-transitions'); + div.focus(); + if (typeof opts.resize === "function") { + opts.resize(); + } + div = null; +}; + +mousePosition = function(e) { + return { + x: e.clientX + document.documentElement.scrollLeft, + y: e.clientY + document.documentElement.scrollTop + }; +}; + +$.fn.DivResizer = function(opts) { + return this.each(function() { + var grippie, start, staticOffset; + div = $(this); + if (div.hasClass("processed")) return; + div.addClass("processed"); + staticOffset = null; + start = function() { + return function(e) { + return startDrag(e, opts); }; }; - $.fn.DivResizer = function(opts) { - return this.each(function() { - var grippie, start, staticOffset; - div = jQuery(this); - if (div.hasClass("processed")) { - return; - } - div.addClass("processed"); - staticOffset = null; - start = function() { - return function(e) { - return startDrag(e, opts); - }; - }; - grippie = div.prepend("
    ").find('.grippie').bind("mousedown", { - el: this - }, start()); - }); - }; - return $.fn.DivResizer; - })(jQuery); - -}).call(this); + grippie = div.prepend("
    ").find('.grippie').bind("mousedown", { + el: this + }, start()); + }); +}; diff --git a/app/assets/javascripts/discourse/components/eyeline.js b/app/assets/javascripts/discourse/components/eyeline.js index fb73272fd93..a5b0f1cd3b1 100644 --- a/app/assets/javascripts/discourse/components/eyeline.js +++ b/app/assets/javascripts/discourse/components/eyeline.js @@ -1,129 +1,97 @@ +/** + Track visible elemnts on the screen. -/* Track visible elements on the screen -*/ + You can register for triggers on: + `focusChanged` the top element we're focusing on -/* You can register for triggers on: -*/ + `seenElement` if we've seen the element + @class Eyeline + @namespace Discourse + @module Discourse + @uses RSVP.EventTarget +**/ +Discourse.Eyeline = function Eyeline(selector) { + this.selector = selector; +} -/* focusChanged: -> the top element we're focusing on -*/ +/** + Call this whenever you want to consider what is being seen by the browser + @method update +**/ +Discourse.Eyeline.prototype.update = function() { + var $elements, $results, atBottom, bottomOffset, docViewBottom, docViewTop, documentHeight, foundElement, windowHeight, + _this = this; -/* seenElement: -> if we've seen the element -*/ + docViewTop = $(window).scrollTop(); + windowHeight = $(window).height(); + docViewBottom = docViewTop + windowHeight; + documentHeight = $(document).height(); + $elements = $(this.selector); + atBottom = false; + if (bottomOffset = $elements.last().offset()) { + atBottom = (bottomOffset.top <= docViewBottom) && (bottomOffset.top >= docViewTop); + } -(function() { + // Whether we've seen any elements in this search + foundElement = false; + $results = $(this.selector); + return $results.each(function(i, elem) { + var $elem, elemBottom, elemTop, markSeen; + $elem = $(elem); + elemTop = $elem.offset().top; + elemBottom = elemTop + $elem.height(); + markSeen = false; + // It's seen if... - Discourse.Eyeline = (function() { + // ...the element is vertically within the top and botom + if ((elemTop <= docViewBottom) && (elemTop >= docViewTop)) markSeen = true; - function Eyeline(selector) { - this.selector = selector; - } + // ...the element top is above the top and the bottom is below the bottom (large elements) + if ((elemTop <= docViewTop) && (elemBottom >= docViewBottom)) markSeen = true; - /* Call this whenever we want to consider what is currently being seen by the browser - */ + // ...we're at the bottom and the bottom of the element is visible (large bottom elements) + if (atBottom && (elemBottom >= docViewTop)) markSeen = true; + if (!markSeen) return true; - Eyeline.prototype.update = function() { - var $elements, $results, atBottom, bottomOffset, docViewBottom, docViewTop, documentHeight, foundElement, windowHeight, - _this = this; - docViewTop = jQuery(window).scrollTop(); - windowHeight = jQuery(window).height(); - docViewBottom = docViewTop + windowHeight; - documentHeight = jQuery(document).height(); - $elements = jQuery(this.selector); - atBottom = false; - if (bottomOffset = $elements.last().offset()) { - atBottom = (bottomOffset.top <= docViewBottom) && (bottomOffset.top >= docViewTop); + // If you hit the bottom we mark all the elements as seen. Otherwise, just the first one + if (!atBottom) { + _this.trigger('saw', { + detail: $elem + }); + if (i === 0) { + _this.trigger('sawTop', { detail: $elem }); } - /* Whether we've seen any elements in this search - */ - - foundElement = false; - $results = jQuery(this.selector); - return $results.each(function(i, elem) { - var $elem, elemBottom, elemTop, markSeen; - $elem = jQuery(elem); - elemTop = $elem.offset().top; - elemBottom = elemTop + $elem.height(); - markSeen = false; - /* It's seen if... - */ - - /* ...the element is vertically within the top and botom - */ - - if ((elemTop <= docViewBottom) && (elemTop >= docViewTop)) { - markSeen = true; - } - /* ...the element top is above the top and the bottom is below the bottom (large elements) - */ - - if ((elemTop <= docViewTop) && (elemBottom >= docViewBottom)) { - markSeen = true; - } - /* ...we're at the bottom and the bottom of the element is visible (large bottom elements) - */ - - if (atBottom && (elemBottom >= docViewTop)) { - markSeen = true; - } - if (!markSeen) { - return true; - } - /* If you hit the bottom we mark all the elements as seen. Otherwise, just the first one - */ - - if (!atBottom) { - _this.trigger('saw', { - detail: $elem - }); - if (i === 0) { - _this.trigger('sawTop', { - detail: $elem - }); - } - return false; - } - if (i === 0) { - _this.trigger('sawTop', { - detail: $elem - }); - } - if (i === ($results.length - 1)) { - return _this.trigger('sawBottom', { - detail: $elem - }); - } - }); - }; - - /* Call this when we know aren't loading any more elements. Mark the rest - */ + return false; + } + if (i === 0) { + _this.trigger('sawTop', { detail: $elem }); + } + if (i === ($results.length - 1)) { + return _this.trigger('sawBottom', { detail: $elem }); + } + }); +}; - /* as seen - */ +/** + Call this when we know aren't loading any more elements. Mark the rest as seen + + @method flushRest +**/ +Discourse.Eyeline.prototype.flushRest = function() { + var _this = this; + return $(this.selector).each(function(i, elem) { + var $elem; + $elem = $(elem); + return _this.trigger('saw', { detail: $elem }); + }); +}; + +RSVP.EventTarget.mixin(Discourse.Eyeline.prototype); - Eyeline.prototype.flushRest = function() { - var _this = this; - return jQuery(this.selector).each(function(i, elem) { - var $elem; - $elem = jQuery(elem); - return _this.trigger('saw', { - detail: $elem - }); - }); - }; - - return Eyeline; - - })(); - - RSVP.EventTarget.mixin(Discourse.Eyeline.prototype); - -}).call(this); diff --git a/app/assets/javascripts/discourse/components/key_value_store.js b/app/assets/javascripts/discourse/components/key_value_store.js index 94c6b5ad232..9ddda67f802 100644 --- a/app/assets/javascripts/discourse/components/key_value_store.js +++ b/app/assets/javascripts/discourse/components/key_value_store.js @@ -1,50 +1,51 @@ +/** + A simple key value store that uses LocalStorage -/* key value store -*/ + @class KeyValueStore + @namespace Discourse + @module Discourse +**/ +Discourse.KeyValueStore = { + initialized: false, + context: "", + init: function(ctx, messageBus) { + initialized = true; + context = ctx; + }, -(function() { - - window.Discourse.KeyValueStore = (function() { - var context, initialized; - initialized = false; - context = ""; - return { - init: function(ctx, messageBus) { - initialized = true; - context = ctx; - }, - abandonLocal: function() { - var i, k; - if (!(localStorage && initialized)) { - return; - } - i = localStorage.length - 1; - while (i >= 0) { - k = localStorage.key(i); - if (k.substring(0, context.length) === context) { - localStorage.removeItem(k); - } - i--; - } - return true; - }, - remove: function(key) { - return localStorage.removeItem(context + key); - }, - set: function(opts) { - if (!(localStorage && initialized)) { - return false; - } - localStorage[context + opts.key] = opts.value; - }, - get: function(key) { - if (!localStorage) { - return null; - } - return localStorage[context + key]; + abandonLocal: function() { + var i, k; + if (!(localStorage && initialized)) { + return; + } + i = localStorage.length - 1; + while (i >= 0) { + k = localStorage.key(i); + if (k.substring(0, context.length) === context) { + localStorage.removeItem(k); } - }; - })(); + i--; + } + return true; + }, + + remove: function(key) { + return localStorage.removeItem(context + key); + }, + + set: function(opts) { + if (!(localStorage && initialized)) { + return false; + } + localStorage[context + opts.key] = opts.value; + }, + + get: function(key) { + if (!localStorage) { + return null; + } + return localStorage[context + key]; + } +} -}).call(this); diff --git a/app/assets/javascripts/discourse/components/lightbox.js b/app/assets/javascripts/discourse/components/lightbox.js index 117178a9a06..3dddb89a5de 100644 --- a/app/assets/javascripts/discourse/components/lightbox.js +++ b/app/assets/javascripts/discourse/components/lightbox.js @@ -1,23 +1,19 @@ +/** + Helper object for lightboxes. -/* Helper object for light boxes. Uses highlight.js which is loaded -*/ - - -/* on demand. -*/ - - -(function() { - - window.Discourse.Lightbox = { - apply: function($elem) { - var _this = this; - return jQuery('a.lightbox', $elem).each(function(i, e) { - return $LAB.script("/javascripts/jquery.colorbox-min.js").wait(function() { - return jQuery(e).colorbox(); - }); + @class Lightbox + @namespace Discourse + @module Discourse +**/ +Discourse.Lightbox = { + apply: function($elem) { + var _this = this; + return $('a.lightbox', $elem).each(function(i, e) { + return $LAB.script("/javascripts/jquery.colorbox-min.js").wait(function() { + return $(e).colorbox(); }); - } - }; + }); + } +} + -}).call(this); diff --git a/app/assets/javascripts/discourse/components/mention.js b/app/assets/javascripts/discourse/components/mention.js new file mode 100644 index 00000000000..e2c5a1f9378 --- /dev/null +++ b/app/assets/javascripts/discourse/components/mention.js @@ -0,0 +1,59 @@ +/** + Helps us determine whether someone has been mentioned by looking up their username. + + @class Mention + @namespace Discourse + @module Discourse +**/ +Discourse.Mention = (function() { + var cache, load, localCache, lookup, lookupCache; + localCache = {}; + cache = function(name, valid) { + localCache[name] = valid; + }; + lookupCache = function(name) { + return localCache[name]; + }; + lookup = function(name, callback) { + var cached; + cached = lookupCache(name); + if (cached === true || cached === false) { + callback(cached); + return false; + } else { + jQuery.get("/users/is_local_username", { + username: name + }, function(r) { + cache(name, r.valid); + return callback(r.valid); + }); + return true; + } + }; + load = function(e) { + var $elem, loading, username; + $elem = $(e); + if ($elem.data('mention-tested')) { + return; + } + username = $elem.text(); + username = username.substr(1); + loading = lookup(username, function(valid) { + if (valid) { + return $elem.replaceWith("@" + username + ""); + } else { + return $elem.removeClass('mention-loading').addClass('mention-tested'); + } + }); + if (loading) { + return $elem.addClass('mention-loading'); + } + }; + return { + load: load, + lookup: lookup, + lookupCache: lookupCache + }; +})(); + + diff --git a/app/assets/javascripts/discourse/components/message_bus.js b/app/assets/javascripts/discourse/components/message_bus.js index 835fb64ea05..ffb142e70f2 100644 --- a/app/assets/javascripts/discourse/components/message_bus.js +++ b/app/assets/javascripts/discourse/components/message_bus.js @@ -1,159 +1,157 @@ /*jshint bitwise: false*/ -(function() { - window.Discourse.MessageBus = (function() { - /* http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript - */ +/** + Message Bus functionality. - var callbacks, clientId, failCount, interval, isHidden, queue, responseCallbacks, uniqueId; - uniqueId = function() { - return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) { - var r, v; - r = Math.random() * 16 | 0; - v = c === 'x' ? r : (r & 0x3 | 0x8); - return v.toString(16); - }); - }; - clientId = uniqueId(); - responseCallbacks = {}; - callbacks = []; - queue = []; - interval = null; - failCount = 0; - isHidden = function() { - if (document.hidden !== void 0) { - return document.hidden; - } else if (document.webkitHidden !== void 0) { - return document.webkitHidden; - } else if (document.msHidden !== void 0) { - return document.msHidden; - } else if (document.mozHidden !== void 0) { - return document.mozHidden; - } else { - /* fallback to problamatic window.focus - */ + @class MessageBus + @namespace Discourse + @module Discourse +**/ +Discourse.MessageBus = (function() { + // http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript + var callbacks, clientId, failCount, interval, isHidden, queue, responseCallbacks, uniqueId; - return !Discourse.get('hasFocus'); - } - }; - return { - enableLongPolling: true, - callbackInterval: 60000, - maxPollInterval: 3 * 60 * 1000, - callbacks: callbacks, - clientId: clientId, - /*TODO - */ + uniqueId = function() { + return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) { + var r, v; + r = Math.random() * 16 | 0; + v = c === 'x' ? r : (r & 0x3 | 0x8); + return v.toString(16); + }); + }; - stop: false, - /* Start polling - */ + clientId = uniqueId(); + responseCallbacks = {}; + callbacks = []; + queue = []; + interval = null; + failCount = 0; - start: function(opts) { - var poll, - _this = this; - if (!opts) opts = {}; - poll = function() { - var data, gotData; - if (callbacks.length === 0) { - setTimeout(poll, 500); - return; - } - data = {}; - callbacks.each(function(c) { - data[c.channel] = c.last_id === void 0 ? -1 : c.last_id; - }); - gotData = false; - _this.longPoll = jQuery.ajax("/message-bus/" + clientId + "/poll?" + (isHidden() || !_this.enableLongPolling ? "dlp=t" : ""), { - data: data, - cache: false, - dataType: 'json', - type: 'POST', - headers: { - 'X-SILENCE-LOGGER': 'true' - }, - success: function(messages) { - failCount = 0; - return messages.each(function(message) { - gotData = true; - return callbacks.each(function(callback) { - if (callback.channel === message.channel) { - callback.last_id = message.message_id; - callback.func(message.data); + isHidden = function() { + if (document.hidden !== void 0) { + return document.hidden; + } else if (document.webkitHidden !== void 0) { + return document.webkitHidden; + } else if (document.msHidden !== void 0) { + return document.msHidden; + } else if (document.mozHidden !== void 0) { + return document.mozHidden; + } else { + // fallback to problamatic window.focus + return !Discourse.get('hasFocus'); + } + }; + + return { + enableLongPolling: true, + callbackInterval: 60000, + maxPollInterval: 3 * 60 * 1000, + callbacks: callbacks, + clientId: clientId, + + stop: false, + + // Start polling + start: function(opts) { + var poll, + _this = this; + if (!opts) opts = {}; + + poll = function() { + var data, gotData; + if (callbacks.length === 0) { + setTimeout(poll, 500); + return; + } + data = {}; + callbacks.each(function(c) { + data[c.channel] = c.last_id === void 0 ? -1 : c.last_id; + }); + gotData = false; + _this.longPoll = jQuery.ajax("/message-bus/" + clientId + "/poll?" + (isHidden() || !_this.enableLongPolling ? "dlp=t" : ""), { + data: data, + cache: false, + dataType: 'json', + type: 'POST', + headers: { + 'X-SILENCE-LOGGER': 'true' + }, + success: function(messages) { + failCount = 0; + return messages.each(function(message) { + gotData = true; + return callbacks.each(function(callback) { + if (callback.channel === message.channel) { + callback.last_id = message.message_id; + callback.func(message.data); + } + if (message.channel === "/__status") { + if (message.data[callback.channel] !== void 0) { + callback.last_id = message.data[callback.channel]; } - if (message.channel === "/__status") { - if (message.data[callback.channel] !== void 0) { - callback.last_id = message.data[callback.channel]; - } - } - }); + } }); - }, - error: failCount += 1, - complete: function() { - if (gotData) { - setTimeout(poll, 100); - } else { - interval = _this.callbackInterval; - if (failCount > 2) { - interval = interval * failCount; - } else if (isHidden()) { - /* slowning down stuff a lot when hidden - */ + }); + }, + error: failCount += 1, + complete: function() { + if (gotData) { + setTimeout(poll, 100); + } else { + interval = _this.callbackInterval; + if (failCount > 2) { + interval = interval * failCount; + } else if (isHidden()) { + /* slowning down stuff a lot when hidden + */ - /* we will need to add a lot of fine tuning here - */ + /* we will need to add a lot of fine tuning here + */ - interval = interval * 4; - } - if (interval > _this.maxPollInterval) { - interval = _this.maxPollInterval; - } - setTimeout(poll, interval); + interval = interval * 4; } - _this.longPoll = null; + if (interval > _this.maxPollInterval) { + interval = _this.maxPollInterval; + } + setTimeout(poll, interval); } - }); - }; - poll(); - }, - /* Subscribe to a channel - */ - - subscribe: function(channel, func, lastId) { - callbacks.push({ - channel: channel, - func: func, - last_id: lastId - }); - if (this.longPoll) { - return this.longPoll.abort(); - } - }, - /* Unsubscribe from a channel - */ - - unsubscribe: function(channel) { - /* TODO proper globbing - */ - - var glob; - if (channel.endsWith("*")) { - channel = channel.substr(0, channel.length - 1); - glob = true; - } - callbacks = callbacks.filter(function(callback) { - if (glob) { - return callback.channel.substr(0, channel.length) !== channel; - } else { - return callback.channel !== channel; + _this.longPoll = null; } }); - if (this.longPoll) { - return this.longPoll.abort(); - } - } - }; - })(); + }; + poll(); + }, -}).call(this); + // Subscribe to a channel + subscribe: function(channel, func, lastId) { + callbacks.push({ + channel: channel, + func: func, + last_id: lastId + }); + if (this.longPoll) { + return this.longPoll.abort(); + } + }, + + // Unsubscribe from a channel + unsubscribe: function(channel) { + // TODO proper globbing + var glob; + if (channel.endsWith("*")) { + channel = channel.substr(0, channel.length - 1); + glob = true; + } + callbacks = callbacks.filter(function(callback) { + if (glob) { + return callback.channel.substr(0, channel.length) !== channel; + } else { + return callback.channel !== channel; + } + }); + if (this.longPoll) { + return this.longPoll.abort(); + } + } + }; +})(); \ No newline at end of file diff --git a/app/assets/javascripts/discourse/components/onebox.js b/app/assets/javascripts/discourse/components/onebox.js new file mode 100644 index 00000000000..372deb5f08d --- /dev/null +++ b/app/assets/javascripts/discourse/components/onebox.js @@ -0,0 +1,89 @@ +/** + A helper for looking up oneboxes and displaying them + + For now it only stores in a var, in future we can change it so it uses localStorage. + + @class Notification + @extends Discourse.Model + @namespace Discourse + @module Discourse +**/ +Discourse.Onebox = (function() { + + var cache, load, localCache, lookup, lookupCache; + localCache = {}; + + cache = function(url, contents) { + localCache[url] = contents; + return null; + }; + + lookupCache = function(url) { + var cached; + cached = localCache[url]; + if (cached && cached.then) { + return null; + } else { + return cached; + } + }; + + lookup = function(url, refresh, callback) { + var cached; + cached = localCache[url]; + if (refresh && cached && !cached.then) { + cached = null; + } + if (cached) { + if (cached.then) { + cached.then(callback(lookupCache(url))); + } else { + callback(cached); + } + return false; + } else { + cache(url, jQuery.get("/onebox", { + url: url, + refresh: refresh + }, function(html) { + cache(url, html); + return callback(html); + })); + return true; + } + }; + + load = function(e, refresh) { + var $elem, loading, url; + if (!refresh) refresh = false; + + url = e.href; + $elem = $(e); + if ($elem.data('onebox-loaded')) { + return; + } + loading = lookup(url, refresh, function(html) { + $elem.removeClass('loading-onebox'); + $elem.data('onebox-loaded'); + if (!html) { + return; + } + if (html.trim().length === 0) { + return; + } + return $elem.replaceWith(html); + }); + if (loading) { + return $elem.addClass('loading-onebox'); + } + }; + + return { + load: load, + lookup: lookup, + lookupCache: lookupCache + }; + +})(); + + diff --git a/app/assets/javascripts/discourse/components/pagedown_editor.js b/app/assets/javascripts/discourse/components/pagedown_editor.js deleted file mode 100644 index 5c46b770759..00000000000 --- a/app/assets/javascripts/discourse/components/pagedown_editor.js +++ /dev/null @@ -1,38 +0,0 @@ -/*global Markdown:true*/ - -(function() { - - window.Discourse.PagedownEditor = Ember.ContainerView.extend({ - elementId: 'pagedown-editor', - init: function() { - this._super(); - /* Add a button bar - */ - - this.pushObject(Em.View.create({ - elementId: 'wmd-button-bar' - })); - this.pushObject(Em.TextArea.create({ - valueBinding: 'parentView.value', - elementId: 'wmd-input' - })); - return this.pushObject(Em.View.createWithMixins(Discourse.Presence, { - elementId: 'wmd-preview', - classNameBindings: [':preview', 'hidden'], - hidden: (function() { - return this.blank('parentView.value'); - }).property('parentView.value') - })); - }, - didInsertElement: function() { - var $wmdInput; - $wmdInput = jQuery('#wmd-input'); - $wmdInput.data('init', true); - this.editor = new Markdown.Editor(Discourse.Utilities.markdownConverter({ - sanitize: true - })); - return this.editor.run(); - } - }); - -}).call(this); diff --git a/app/assets/javascripts/discourse/components/probes.js b/app/assets/javascripts/discourse/components/probes.js index a1b6c34571f..e2a497904f9 100644 --- a/app/assets/javascripts/discourse/components/probes.js +++ b/app/assets/javascripts/discourse/components/probes.js @@ -5,27 +5,26 @@ * * Examples: * - -someFunction = window.probes.measure(someFunction, { - name: "somename" // or function(args) { return "name"; }, - before: function(data, owner, args) { - // if owner is true, we are not in a recursive function call. - // - // data contains the bucker of data already measuer - // data.count >= 0 - // data.time is the total time measured till now - // - // arguments contains the original arguments sent to the function - }, - after: function(data, owner, args) { - // same format as before - } -}); - - -// minimal -someFunction = window.probes.measure(someFunction, "someFunction"); - + * + * someFunction = window.probes.measure(someFunction, { + * name: "somename" // or function(args) { return "name"; }, + * before: function(data, owner, args) { + * // if owner is true, we are not in a recursive function call. + * // + * // data contains the bucker of data already measuer + * // data.count >= 0 + * // data.time is the total time measured till now + * // + * // arguments contains the original arguments sent to the function + * }, + * after: function(data, owner, args) { + * // same format as before + * } + * }); + * + * + * // minimal + * someFunction = window.probes.measure(someFunction, "someFunction"); * * * */ diff --git a/app/assets/javascripts/discourse/components/sanitize.js b/app/assets/javascripts/discourse/components/sanitize.js deleted file mode 100644 index 3bce16c96a1..00000000000 --- a/app/assets/javascripts/discourse/components/sanitize.js +++ /dev/null @@ -1,92 +0,0 @@ -// Sam: I wrote this but it is totally unsafe so I ported Google Cajole -// Thing is Cajole is old and complex (albeit super duper fast) -// -// I would like this ported to: https://github.com/tautologistics/node-htmlparser , perf tested -// and move off cajole -// -// See also: http://stackoverflow.com/questions/14971083/is-jquerys-safe-from-xss -// - -// (function( $ ) { -// -// var elements = ["a", "abbr", "aside", "b", "bdo", "blockquote", "br", -// "caption", "cite", "code", "col", "colgroup", "dd", "div", -// "del", "dfn", "dl", "dt", "em", "hr", "figcaption", "figure", -// "h1", "h2", "h3", "h4", "h5", "h6", "hgroup", "i", "img", "ins", -// "kbd", "li", "mark", "ol", "p", "pre", "q", "rp", "rt", "ruby", -// "s", "samp", "small", "span", "strike", "strong", "sub", "sup", -// "table", "tbody", "td", "tfoot", "th", "thead", "time", "tr", "u", -// "ul", "var", "wbr"]; -// -// var attributes = { -// 'all' : ['dir', 'lang', 'title', 'class'], -// 'aside' : ['data-post', 'data-full', 'data-topic'], -// 'a' : ['href'], -// 'blockquote' : ['cite'], -// 'col' : ['span', 'width'], -// 'colgroup' : ['span', 'width'], -// 'del' : ['cite', 'datetime'], -// 'img' : ['align', 'alt', 'height', 'src', 'width'], -// 'ins' : ['cite', 'datetime'], -// 'ol' : ['start', 'reversed', 'type'], -// 'q' : ['cite'], -// 'span' : ['style'], -// 'table' : ['summary', 'width', 'style', 'cellpadding', 'cellspacing'], -// 'td' : ['abbr', 'axis', 'colspan', 'rowspan', 'width', 'style'], -// 'th' : ['abbr', 'axis', 'colspan', 'rowspan', 'scope', 'width', 'style'], -// 'time' : ['datetime', 'pubdate'], -// 'ul' : ['type'] -// -// }; -// -// var elementMap = {}; -// jQuery.each(elements, function(idx,e){ -// elementMap[e] = true; -// }); -// -// var scrubAttributes = function(e){ -// jQuery.each(e.attributes, function(idx, attr){ -// -// if(jQuery.inArray(attr.name, attributes.all) === -1 && -// jQuery.inArray(attr.name, attributes[e.tagName.toLowerCase()]) === -1) { -// e.removeAttribute(attr.name); -// } -// }); -// return(e); -// }; -// -// var scrubNode = function(e){ -// if (!e.tagName) { return(e); } -// if(elementMap[e.tagName.toLowerCase()]){ -// return scrubAttributes(e); -// } -// else -// { -// return null; -// } -// }; -// -// var scrubTree = function(e) { -// if (!e) { return; } -// -// var clean = scrubNode(e); -// if(!clean){ -// e.parentNode.removeChild(e); -// } -// else { -// jQuery.each(clean.children, function(idx, inner){ -// scrubTree(inner); -// }); -// } -// }; -// -// $.fn.sanitize = function() { -// clean = this.filter(function(){ -// return scrubNode(this); -// }).each(function(){ -// scrubTree(this); -// }); -// -// return clean; -// }; -// })( jQuery ); diff --git a/app/assets/javascripts/discourse/components/screen_track.js b/app/assets/javascripts/discourse/components/screen_track.js index ad251a50d07..3d50638bff6 100644 --- a/app/assets/javascripts/discourse/components/screen_track.js +++ b/app/assets/javascripts/discourse/components/screen_track.js @@ -1,169 +1,159 @@ +/** + We use this class to track how long posts in a topic are on the screen. -/* We use this class to track how long posts in a topic are on the screen. -*/ + @class ScreenTrack + @extends Ember.Object + @namespace Discourse + @module Discourse +**/ +Discourse.ScreenTrack = Ember.Object.extend({ + // Don't send events if we haven't scrolled in a long time + PAUSE_UNLESS_SCROLLED: 1000 * 60 * 3, -/* This could be a potentially awesome metric to keep track of. -*/ + // After 6 minutes stop tracking read position on post + MAX_TRACKING_TIME: 1000 * 60 * 6, + totalTimings: {}, -(function() { + // Elements to track + timings: {}, + topicTime: 0, + cancelled: false, - window.Discourse.ScreenTrack = Ember.Object.extend({ - /* Don't send events if we haven't scrolled in a long time - */ + track: function(elementId, postNumber) { + this.timings["#" + elementId] = { + time: 0, + postNumber: postNumber + }; + }, - PAUSE_UNLESS_SCROLLED: 1000 * 60 * 3, - /* After 6 minutes stop tracking read position on post - */ - - MAX_TRACKING_TIME: 1000 * 60 * 6, - totalTimings: {}, - /* Elements to track - */ - - timings: {}, - topicTime: 0, - cancelled: false, - track: function(elementId, postNumber) { - this.timings["#" + elementId] = { - time: 0, - postNumber: postNumber - }; - }, - guessedSeen: function(postNumber) { - if (postNumber > (this.highestSeen || 0)) { - this.highestSeen = postNumber; - } - }, - /* Reset our timers - */ - - reset: function() { - this.lastTick = new Date().getTime(); - this.lastFlush = 0; - this.cancelled = false; - }, - /* Start tracking - */ - - start: function() { - var _this = this; - this.reset(); - this.lastScrolled = new Date().getTime(); - this.interval = setInterval(function() { - return _this.tick(); - }, 1000); - }, - /* Cancel and eject any tracking we have buffered - */ - - cancel: function() { - this.cancelled = true; - this.timings = {}; - this.topicTime = 0; - clearInterval(this.interval); - this.interval = null; - }, - /* Stop tracking and flush buffered read records - */ - - stop: function() { - clearInterval(this.interval); - this.interval = null; - return this.flush(); - }, - scrolled: function() { - this.lastScrolled = new Date().getTime(); - }, - flush: function() { - var highestSeenByTopic, newTimings, topicId, - _this = this; - if (this.cancelled) { - return; - } - /* We don't log anything unless we're logged in - */ - - if (!Discourse.get('currentUser')) { - return; - } - newTimings = {}; - Object.values(this.timings, function(timing) { - if (!_this.totalTimings[timing.postNumber]) - _this.totalTimings[timing.postNumber] = 0; - - if (timing.time > 0 && _this.totalTimings[timing.postNumber] < _this.MAX_TRACKING_TIME) { - _this.totalTimings[timing.postNumber] += timing.time; - newTimings[timing.postNumber] = timing.time; - } - timing.time = 0; - }); - topicId = this.get('topic_id'); - highestSeenByTopic = Discourse.get('highestSeenByTopic'); - if ((highestSeenByTopic[topicId] || 0) < this.highestSeen) { - highestSeenByTopic[topicId] = this.highestSeen; - } - if (!Object.isEmpty(newTimings)) { - jQuery.ajax('/topics/timings', { - data: { - timings: newTimings, - topic_time: this.topicTime, - highest_seen: this.highestSeen, - topic_id: topicId - }, - cache: false, - type: 'POST', - headers: { - 'X-SILENCE-LOGGER': 'true' - } - }); - this.topicTime = 0; - } - this.lastFlush = 0; - }, - tick: function() { - /* If the user hasn't scrolled the browser in a long time, stop tracking time read - */ - - var diff, docViewBottom, docViewTop, sinceScrolled, - _this = this; - sinceScrolled = new Date().getTime() - this.lastScrolled; - if (sinceScrolled > this.PAUSE_UNLESS_SCROLLED) { - this.reset(); - return; - } - diff = new Date().getTime() - this.lastTick; - this.lastFlush += diff; - this.lastTick = new Date().getTime(); - if (this.lastFlush > (Discourse.SiteSettings.flush_timings_secs * 1000)) { - this.flush(); - } - /* Don't track timings if we're not in focus - */ - - if (!Discourse.get("hasFocus")) { - return; - } - this.topicTime += diff; - docViewTop = jQuery(window).scrollTop() + jQuery('header').height(); - docViewBottom = docViewTop + jQuery(window).height(); - return Object.keys(this.timings, function(id) { - var $element, elemBottom, elemTop, timing; - $element = jQuery(id); - if ($element.length === 1) { - elemTop = $element.offset().top; - elemBottom = elemTop + $element.height(); - /* If part of the element is on the screen, increase the counter - */ - - if (((docViewTop <= elemTop && elemTop <= docViewBottom)) || ((docViewTop <= elemBottom && elemBottom <= docViewBottom))) { - timing = _this.timings[id]; - timing.time = timing.time + diff; - } - } - }); + guessedSeen: function(postNumber) { + if (postNumber > (this.highestSeen || 0)) { + this.highestSeen = postNumber; } - }); + }, + + // Reset our timers + reset: function() { + this.lastTick = new Date().getTime(); + this.lastFlush = 0; + this.cancelled = false; + }, + + // Start tracking + start: function() { + var _this = this; + this.reset(); + this.lastScrolled = new Date().getTime(); + this.interval = setInterval(function() { + return _this.tick(); + }, 1000); + }, + + // Cancel and eject any tracking we have buffered + cancel: function() { + this.cancelled = true; + this.timings = {}; + this.topicTime = 0; + clearInterval(this.interval); + this.interval = null; + }, + + // Stop tracking and flush buffered read records + stop: function() { + clearInterval(this.interval); + this.interval = null; + return this.flush(); + }, + + scrolled: function() { + this.lastScrolled = new Date().getTime(); + }, + + flush: function() { + var highestSeenByTopic, newTimings, topicId, + _this = this; + if (this.cancelled) { + return; + } + // We don't log anything unless we're logged in + if (!Discourse.get('currentUser')) { + return; + } + newTimings = {}; + Object.values(this.timings, function(timing) { + if (!_this.totalTimings[timing.postNumber]) + _this.totalTimings[timing.postNumber] = 0; + + if (timing.time > 0 && _this.totalTimings[timing.postNumber] < _this.MAX_TRACKING_TIME) { + _this.totalTimings[timing.postNumber] += timing.time; + newTimings[timing.postNumber] = timing.time; + } + timing.time = 0; + }); + topicId = this.get('topic_id'); + highestSeenByTopic = Discourse.get('highestSeenByTopic'); + if ((highestSeenByTopic[topicId] || 0) < this.highestSeen) { + highestSeenByTopic[topicId] = this.highestSeen; + } + if (!Object.isEmpty(newTimings)) { + jQuery.ajax('/topics/timings', { + data: { + timings: newTimings, + topic_time: this.topicTime, + highest_seen: this.highestSeen, + topic_id: topicId + }, + cache: false, + type: 'POST', + headers: { + 'X-SILENCE-LOGGER': 'true' + } + }); + this.topicTime = 0; + } + this.lastFlush = 0; + }, + + tick: function() { + // If the user hasn't scrolled the browser in a long time, stop tracking time read + var diff, docViewBottom, docViewTop, sinceScrolled, + _this = this; + sinceScrolled = new Date().getTime() - this.lastScrolled; + if (sinceScrolled > this.PAUSE_UNLESS_SCROLLED) { + this.reset(); + return; + } + diff = new Date().getTime() - this.lastTick; + this.lastFlush += diff; + this.lastTick = new Date().getTime(); + if (this.lastFlush > (Discourse.SiteSettings.flush_timings_secs * 1000)) { + this.flush(); + } + + // Don't track timings if we're not in focus + if (!Discourse.get("hasFocus")) return; + + this.topicTime += diff; + docViewTop = $(window).scrollTop() + $('header').height(); + docViewBottom = docViewTop + $(window).height(); + return Object.keys(this.timings, function(id) { + var $element, elemBottom, elemTop, timing; + $element = $(id); + if ($element.length === 1) { + elemTop = $element.offset().top; + elemBottom = elemTop + $element.height(); + + // If part of the element is on the screen, increase the counter + if (((docViewTop <= elemTop && elemTop <= docViewBottom)) || ((docViewTop <= elemBottom && elemBottom <= docViewBottom))) { + timing = _this.timings[id]; + timing.time = timing.time + diff; + } + } + }); + } + +}); + -}).call(this); diff --git a/app/assets/javascripts/discourse/components/syntax_highlighting.js b/app/assets/javascripts/discourse/components/syntax_highlighting.js index d138263b60b..930ae516979 100644 --- a/app/assets/javascripts/discourse/components/syntax_highlighting.js +++ b/app/assets/javascripts/discourse/components/syntax_highlighting.js @@ -1,18 +1,28 @@ /*global hljs:true */ -/* Helper object for syntax highlighting. Uses highlight.js which is loaded - on demand. */ -(function() { +/** + Helper object for syntax highlighting. Uses highlight.js which is loaded on demand. - window.Discourse.SyntaxHighlighting = { - apply: function($elem) { - var _this = this; - return jQuery('pre code[class]', $elem).each(function(i, e) { - return $LAB.script("/javascripts/highlight-handlebars.pack.js").wait(function() { - return hljs.highlightBlock(e); - }); + @class SyntaxHighlighting + @namespace Discourse + @module Discourse +**/ +Discourse.SyntaxHighlighting = { + + /** + Apply syntax highlighting to a jQuery element + + @method apply + @param {jQuery.selector} $elem The element we want to apply our highlighting to + **/ + apply: function($elem) { + var _this = this; + return $('pre code[class]', $elem).each(function(i, e) { + return $LAB.script("/javascripts/highlight-handlebars.pack.js").wait(function() { + return hljs.highlightBlock(e); }); - } - }; + }); + } +}; + -}).call(this); diff --git a/app/assets/javascripts/discourse/components/transition_helper.js b/app/assets/javascripts/discourse/components/transition_helper.js index 31518db00d3..67398b6e1c2 100644 --- a/app/assets/javascripts/discourse/components/transition_helper.js +++ b/app/assets/javascripts/discourse/components/transition_helper.js @@ -1,45 +1,43 @@ +/** + CSS transitions are a PITA, often we need to queue some js after a transition, this helper ensures + it happens after the transition. -/* CSS transitions are a PITA, often we need to queue some js after a transition, this helper ensures -*/ + SO: http://stackoverflow.com/questions/9943435/css3-animation-end-techniques -/* it happens after the transition -*/ + @class TransitionHelper + @namespace Discourse + @module Discourse +**/ +var dummy, eventNameHash, transitionEnd, _getTransitionEndEventName; -/* SO: http://stackoverflow.com/questions/9943435/css3-animation-end-techniques -*/ +dummy = document.createElement("div"); +eventNameHash = { + webkit: "webkitTransitionEnd", + Moz: "transitionend", + O: "oTransitionEnd", + ms: "MSTransitionEnd" +}; -(function() { - var dummy, eventNameHash, transitionEnd, _getTransitionEndEventName; - - dummy = document.createElement("div"); - - eventNameHash = { - webkit: "webkitTransitionEnd", - Moz: "transitionend", - O: "oTransitionEnd", - ms: "MSTransitionEnd" - }; - - _getTransitionEndEventName = function() { - var retValue; - retValue = "transitionend"; - Object.keys(eventNameHash).some(function(vendor) { - if (vendor + "TransitionProperty" in dummy.style) { - retValue = eventNameHash[vendor]; - return true; - } - }); - return retValue; - }; - transitionEnd = _getTransitionEndEventName(); - - window.Discourse.TransitionHelper = { - after: function(element, callback) { - return jQuery(element).on(transitionEnd, callback); +_getTransitionEndEventName = function() { + var retValue; + retValue = "transitionend"; + Object.keys(eventNameHash).some(function(vendor) { + if (vendor + "TransitionProperty" in dummy.style) { + retValue = eventNameHash[vendor]; + return true; } - }; + }); + return retValue; +}; +transitionEnd = _getTransitionEndEventName(); + +window.Discourse.TransitionHelper = { + after: function(element, callback) { + return $(element).on(transitionEnd, callback); + } +}; + -}).call(this); diff --git a/app/assets/javascripts/discourse/components/user_search.js b/app/assets/javascripts/discourse/components/user_search.js index 8a3fbe8a1ce..e6f2a60fbed 100644 --- a/app/assets/javascripts/discourse/components/user_search.js +++ b/app/assets/javascripts/discourse/components/user_search.js @@ -1,76 +1,81 @@ -(function() { - var cache, cacheTime, cacheTopicId, debouncedSearch, doSearch; +/** + Helper for searching for Users - cache = {}; + @class UserSearch + @namespace Discourse + @module Discourse +**/ +var cache, cacheTime, cacheTopicId, debouncedSearch, doSearch; - cacheTopicId = null; +cache = {}; - cacheTime = null; +cacheTopicId = null; - doSearch = function(term, topicId, success) { - return jQuery.ajax({ - url: '/users/search/users', - dataType: 'JSON', - data: { - term: term, - topic_id: topicId - }, - success: function(r) { - cache[term] = r; - cacheTime = new Date(); - return success(r); - } - }); - }; +cacheTime = null; - debouncedSearch = Discourse.debounce(doSearch, 200); +doSearch = function(term, topicId, success) { + return jQuery.ajax({ + url: '/users/search/users', + dataType: 'JSON', + data: { + term: term, + topic_id: topicId + }, + success: function(r) { + cache[term] = r; + cacheTime = new Date(); + return success(r); + } + }); +}; - window.Discourse.UserSearch = { - search: function(options) { - var callback, exclude, limit, success, term, topicId; - term = options.term || ""; - callback = options.callback; - exclude = options.exclude || []; - topicId = options.topicId; - limit = options.limit || 5; - if (!callback) { - throw "missing callback"; - } - /*TODO site setting for allowed regex in username ? - */ +debouncedSearch = Discourse.debounce(doSearch, 200); - if (term.match(/[^a-zA-Z0-9\_\.]/)) { - callback([]); - return true; - } - if ((new Date() - cacheTime) > 30000) { - cache = {}; - } - if (cacheTopicId !== topicId) { - cache = {}; - } - cacheTopicId = topicId; - success = function(r) { - var result; - result = []; - r.users.each(function(u) { - if (exclude.indexOf(u.username) === -1) { - result.push(u); - } - if (result.length > limit) { - return false; - } - return true; - }); - return callback(result); - }; - if (cache[term]) { - success(cache[term]); - } else { - debouncedSearch(term, topicId, success); - } +Discourse.UserSearch = { + search: function(options) { + var callback, exclude, limit, success, term, topicId; + term = options.term || ""; + callback = options.callback; + exclude = options.exclude || []; + topicId = options.topicId; + limit = options.limit || 5; + if (!callback) { + throw "missing callback"; + } + + // TODO site setting for allowed regex in username + if (term.match(/[^a-zA-Z0-9\_\.]/)) { + callback([]); return true; } - }; + if ((new Date() - cacheTime) > 30000) { + cache = {}; + } + if (cacheTopicId !== topicId) { + cache = {}; + } + cacheTopicId = topicId; + success = function(r) { + var result; + result = []; + r.users.each(function(u) { + if (exclude.indexOf(u.username) === -1) { + result.push(u); + } + if (result.length > limit) { + return false; + } + return true; + }); + return callback(result); + }; + if (cache[term]) { + success(cache[term]); + } else { + debouncedSearch(term, topicId, success); + } + return true; + } +}; + -}).call(this); diff --git a/app/assets/javascripts/discourse/components/utilities.js b/app/assets/javascripts/discourse/components/utilities.js index fc6b1040d87..2712d102728 100644 --- a/app/assets/javascripts/discourse/components/utilities.js +++ b/app/assets/javascripts/discourse/components/utilities.js @@ -1,277 +1,266 @@ /*global sanitizeHtml:true Markdown:true */ -(function() { - var baseUrl, site; +/** + General utility functions - baseUrl = null; + @class Utilities + @namespace Discourse + @module Discourse +**/ +Discourse.Utilities = { - site = null; + translateSize: function(size) { + switch (size) { + case 'tiny': + size = 20; + break; + case 'small': + size = 25; + break; + case 'medium': + size = 32; + break; + case 'large': + size = 45; + } + return size; + }, - Discourse.Utilities = { - translateSize: function(size) { - switch (size) { - case 'tiny': - size = 20; - break; - case 'small': - size = 25; - break; - case 'medium': - size = 32; - break; - case 'large': - size = 45; - } - return size; - }, - categoryUrlId: function(category) { - var id, slug; - if (!category) { - return ""; - } - id = Em.get(category, 'id'); - slug = Em.get(category, 'slug'); - if ((!slug) || slug.isBlank()) { - return "" + id + "-category"; - } - return slug; - }, - /* Create a badge like category link - */ + categoryUrlId: function(category) { + var id, slug; + if (!category) { + return ""; + } + id = Em.get(category, 'id'); + slug = Em.get(category, 'slug'); + if ((!slug) || slug.isBlank()) { + return "" + id + "-category"; + } + return slug; + }, - categoryLink: function(category) { - var color, name, description, result; - if (!category) return ""; + // Create a badge like category link + categoryLink: function(category) { + var color, name, description, result; + if (!category) return ""; - color = Em.get(category, 'color'); - name = Em.get(category, 'name'); - description = Em.get(category, 'description'); + color = Em.get(category, 'color'); + name = Em.get(category, 'name'); + description = Em.get(category, 'description'); - // Build the HTML link - result = "" + name + ""; - }, - avatarUrl: function(username, size, template) { - var rawSize; - if (!username) { - return ""; - } - size = Discourse.Utilities.translateSize(size); - rawSize = (size * (window.devicePixelRatio || 1)).toFixed(); - if (template) { - return template.replace(/\{size\}/g, rawSize); - } - return "/users/" + (username.toLowerCase()) + "/avatar/" + rawSize + "?__ws=" + (encodeURIComponent(Discourse.BaseUrl || "")); - }, - avatarImg: function(options) { - var extraClasses, size, title, url; - size = Discourse.Utilities.translateSize(options.size); - title = options.title || ""; - extraClasses = options.extraClasses || ""; - url = Discourse.Utilities.avatarUrl(options.username, options.size, options.avatarTemplate); - return ""; - }, - postUrl: function(slug, topicId, postNumber) { - var url; - url = "/t/"; - if (slug) { - url += slug + "/"; - } - url += topicId; - if (postNumber > 1) { - url += "/" + postNumber; - } - return url; - }, - emailValid: function(email) { - /* see: http://stackoverflow.com/questions/46155/validate-email-address-in-javascript - */ + return result + "style=\"background-color: #" + color + "\">" + name + ""; + }, - var re; - re = /^[a-zA-Z0-9!#$%&'*+\/=?\^_`{|}~\-]+(?:\.[a-zA-Z0-9!#$%&'\*+\/=?\^_`{|}~\-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?$/; - return re.test(email); - }, - selectedText: function() { - var t; - t = ''; - if (window.getSelection) { - t = window.getSelection().toString(); - } else if (document.getSelection) { - t = document.getSelection().toString(); - } else if (document.selection) { - t = document.selection.createRange().text; - } - return String(t).trim(); - }, - /* Determine the position of the caret in an element - */ + avatarUrl: function(username, size, template) { + var rawSize; + if (!username) { + return ""; + } + size = Discourse.Utilities.translateSize(size); + rawSize = (size * (window.devicePixelRatio || 1)).toFixed(); + if (template) { + return template.replace(/\{size\}/g, rawSize); + } + return "/users/" + (username.toLowerCase()) + "/avatar/" + rawSize + "?__ws=" + (encodeURIComponent(Discourse.BaseUrl || "")); + }, - caretPosition: function(el) { - var r, rc, re; - if (el.selectionStart) { - return el.selectionStart; - } - if (document.selection) { - el.focus(); - r = document.selection.createRange(); - if (!r) return 0; - - re = el.createTextRange(); - rc = re.duplicate(); - re.moveToBookmark(r.getBookmark()); - rc.setEndPoint('EndToStart', re); - return rc.text.length; - } - return 0; - }, - /* Set the caret's position - */ + avatarImg: function(options) { + var extraClasses, size, title, url; + size = Discourse.Utilities.translateSize(options.size); + title = options.title || ""; + extraClasses = options.extraClasses || ""; + url = Discourse.Utilities.avatarUrl(options.username, options.size, options.avatarTemplate); + return ""; + }, - setCaretPosition: function(ctrl, pos) { - var range; - if (ctrl.setSelectionRange) { - ctrl.focus(); - ctrl.setSelectionRange(pos, pos); - return; - } - if (ctrl.createTextRange) { - range = ctrl.createTextRange(); - range.collapse(true); - range.moveEnd('character', pos); - range.moveStart('character', pos); - return range.select(); - } - }, - markdownConverter: function(opts) { - var converter, mentionLookup, - _this = this; - converter = new Markdown.Converter(); - if (opts) { - mentionLookup = opts.mentionLookup; - } - mentionLookup = mentionLookup || Discourse.Mention.lookupCache; - /* Before cooking callbacks - */ + postUrl: function(slug, topicId, postNumber) { + var url; + url = "/t/"; + if (slug) { + url += slug + "/"; + } + url += topicId; + if (postNumber > 1) { + url += "/" + postNumber; + } + return url; + }, - converter.hooks.chain("preConversion", function(text) { - _this.trigger('beforeCook', { - detail: text, - opts: opts - }); - return _this.textResult || text; + emailValid: function(email) { + // see: http://stackoverflow.com/questions/46155/validate-email-address-in-javascript + var re; + re = /^[a-zA-Z0-9!#$%&'*+\/=?\^_`{|}~\-]+(?:\.[a-zA-Z0-9!#$%&'\*+\/=?\^_`{|}~\-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?$/; + return re.test(email); + }, + + selectedText: function() { + var t; + t = ''; + if (window.getSelection) { + t = window.getSelection().toString(); + } else if (document.getSelection) { + t = document.getSelection().toString(); + } else if (document.selection) { + t = document.selection.createRange().text; + } + return String(t).trim(); + }, + + // Determine the position of the caret in an element + caretPosition: function(el) { + var r, rc, re; + if (el.selectionStart) { + return el.selectionStart; + } + if (document.selection) { + el.focus(); + r = document.selection.createRange(); + if (!r) return 0; + + re = el.createTextRange(); + rc = re.duplicate(); + re.moveToBookmark(r.getBookmark()); + rc.setEndPoint('EndToStart', re); + return rc.text.length; + } + return 0; + }, + + // Set the caret's position + setCaretPosition: function(ctrl, pos) { + var range; + if (ctrl.setSelectionRange) { + ctrl.focus(); + ctrl.setSelectionRange(pos, pos); + return; + } + if (ctrl.createTextRange) { + range = ctrl.createTextRange(); + range.collapse(true); + range.moveEnd('character', pos); + range.moveStart('character', pos); + return range.select(); + } + }, + + markdownConverter: function(opts) { + var converter, mentionLookup, + _this = this; + converter = new Markdown.Converter(); + if (opts) { + mentionLookup = opts.mentionLookup; + } + mentionLookup = mentionLookup || Discourse.Mention.lookupCache; + + // Before cooking callbacks + converter.hooks.chain("preConversion", function(text) { + _this.trigger('beforeCook', { + detail: text, + opts: opts }); - /* Support autolinking of www.something.com - */ + return _this.textResult || text; + }); + // Support autolinking of www.something.com + converter.hooks.chain("preConversion", function(text) { + return text.replace(/(^|[\s\n])(www\.[a-z\.\-\_\(\)\/\?\=\%0-9]+)/gim, function(full, _, rest) { + return " " + rest + ""; + }); + }); + + // newline prediction in trivial cases + if (!Discourse.SiteSettings.traditional_markdown_linebreaks) { converter.hooks.chain("preConversion", function(text) { - return text.replace(/(^|[\s\n])(www\.[a-z\.\-\_\(\)\/\?\=\%0-9]+)/gim, function(full, _, rest) { - return " " + rest + ""; + return text.replace(/(^[\w<][^\n]*\n+)/gim, function(t) { + if (t.match(/\n{2}/gim)) { + return t; + } + return t.replace("\n", " \n"); }); }); - /* newline prediction in trivial cases - */ + } - if (!Discourse.SiteSettings.traditional_markdown_linebreaks) { - converter.hooks.chain("preConversion", function(text) { - return text.replace(/(^[\w<][^\n]*\n+)/gim, function(t) { - if (t.match(/\n{2}/gim)) { - return t; - } - return t.replace("\n", " \n"); - }); - }); - } - /* github style fenced code - */ - - converter.hooks.chain("preConversion", function(text) { - return text.replace(/^`{3}(?:(.*$)\n)?([\s\S]*?)^`{3}/gm, function(wholeMatch, m1, m2) { - var escaped; - escaped = Handlebars.Utils.escapeExpression(m2); - return "
    " + escaped + "
    "; - }); + // github style fenced code + converter.hooks.chain("preConversion", function(text) { + return text.replace(/^`{3}(?:(.*$)\n)?([\s\S]*?)^`{3}/gm, function(wholeMatch, m1, m2) { + var escaped; + escaped = Handlebars.Utils.escapeExpression(m2); + return "
    " + escaped + "
    "; }); + }); + + converter.hooks.chain("postConversion", function(text) { + if (!text) return ""; + + // don't to mention voodoo in pres + text = text.replace(/
    ([\s\S]*@[\s\S]*)<\/pre>/gi, function(wholeMatch, inner) {
+        return "
    " + (inner.replace(/@/g, '@')) + "
    ";
+      });
+
+      // Add @mentions of names
+      text = text.replace(/([\s\t>,:'|";\]])(@[A-Za-z0-9_-|\.]*[A-Za-z0-9_-|]+)(?=[\s\t<\!:|;',"\?\.])/g, function(x, pre, name) {
+        if (mentionLookup(name.substr(1))) {
+          return "" + pre + "" + name + "";
+        } else {
+          return "" + pre + "" + name + "";
+        }
+      });
+
+      // a primitive attempt at oneboxing, this regex gives me much eye sores
+      text = text.replace(/(
  • )?((
    |
    )[\s\n\r]*)(]*)>([^<]+<\/a>[\s\n\r]*(?=<\/p>|
    ))/gi, function() {
+        // We don't onebox items in a list
+        var onebox, url;
+        if (arguments[1]) {
+          return arguments[0];
+        }
+        url = arguments[5];
+        if (Discourse && Discourse.Onebox) {
+          onebox = Discourse.Onebox.lookupCache(url);
+        }
+        if (onebox && !onebox.isBlank()) {
+          return arguments[2] + onebox;
+        } else {
+          return arguments[2] + arguments[4] + " class=\"onebox\" target=\"_blank\">" + arguments[6];
+        }
+      });
+
+      return(text);
+    });
+
+    converter.hooks.chain("postConversion", function(text) {
+      return Discourse.BBCode.format(text, opts);
+    });
+
+    if (opts.sanitize) {
       converter.hooks.chain("postConversion", function(text) {
-        if (!text) {
+        if (!window.sanitizeHtml) {
           return "";
         }
-        /* don't to mention voodoo in pres
-        */
-
-        text = text.replace(/
    ([\s\S]*@[\s\S]*)<\/pre>/gi, function(wholeMatch, inner) {
-          return "
    " + (inner.replace(/@/g, '@')) + "
    ";
-        });
-        /* Add @mentions of names
-        */
-
-        text = text.replace(/([\s\t>,:'|";\]])(@[A-Za-z0-9_-|\.]*[A-Za-z0-9_-|]+)(?=[\s\t<\!:|;',"\?\.])/g, function(x, pre, name) {
-          if (mentionLookup(name.substr(1))) {
-            return "" + pre + "    " + name + "";
-          } else {
-            return "" + pre + "" + name + "";
-          }
-        });
-        /* a primitive attempt at oneboxing, this regex gives me much eye sores
-        */
-
-        text = text.replace(/(
  • )?((
    |
    )[\s\n\r]*)(]*)>([^<]+<\/a>[\s\n\r]*(?=<\/p>|
    ))/gi, function() {
-          /* We don't onebox items in a list
-          */
-
-          var onebox, url;
-          if (arguments[1]) {
-            return arguments[0];
-          }
-          url = arguments[5];
-          if (Discourse && Discourse.Onebox) {
-            onebox = Discourse.Onebox.lookupCache(url);
-          }
-          if (onebox && !onebox.isBlank()) {
-            return arguments[2] + onebox;
-          } else {
-            return arguments[2] + arguments[4] + " class=\"onebox\" target=\"_blank\">" + arguments[6];
-          }
-        });
-
-        return(text);
+        return sanitizeHtml(text);
       });
-
-      converter.hooks.chain("postConversion", function(text) {
-        return Discourse.BBCode.format(text, opts);
-      });
-      if (opts.sanitize) {
-        converter.hooks.chain("postConversion", function(text) {
-          if (!window.sanitizeHtml) {
-            return "";
-          }
-          return sanitizeHtml(text);
-        });
-      }
-      return converter;
-    },
-    /* Takes raw input and cooks it to display nicely (mostly markdown)
-    */
-
-    cook: function(raw, opts) {
-      if (!opts) opts = {};
-      
-      // Make sure we've got a string
-      if (!raw) return "";
-      
-      if (raw.length === 0) return "";
-      
-      this.converter = this.markdownConverter(opts);
-      return this.converter.makeHtml(raw);
     }
-  };
+    return converter;
+  },
 
-  RSVP.EventTarget.mixin(Discourse.Utilities);
+  // Takes raw input and cooks it to display nicely (mostly markdown)
+  cook: function(raw, opts) {
+    if (!opts) opts = {};
 
-}).call(this);
+    // Make sure we've got a string
+    if (!raw) return "";
+
+    if (raw.length === 0) return "";
+
+    this.converter = this.markdownConverter(opts);
+    return this.converter.makeHtml(raw);
+  }
+};
+
+RSVP.EventTarget.mixin(Discourse.Utilities);
diff --git a/app/assets/javascripts/discourse/controllers/application_controller.js b/app/assets/javascripts/discourse/controllers/application_controller.js
index 5b35781f13c..dee288bcc00 100644
--- a/app/assets/javascripts/discourse/controllers/application_controller.js
+++ b/app/assets/javascripts/discourse/controllers/application_controller.js
@@ -1,7 +1,16 @@
 /*global _gaq:true */
 
-window.Discourse.ApplicationController = Ember.Controller.extend({
+/**
+  The base controller for all things Discourse
+
+  @class ApplicationController
+  @extends Discourse.Controller
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ApplicationController = Discourse.Controller.extend({
   needs: ['modal'],
+
   showLogin: function() {
     var _ref;
     return (_ref = this.get('controllers.modal')) ? _ref.show(Discourse.LoginView.create()) : void 0;
@@ -18,5 +27,5 @@ window.Discourse.ApplicationController = Ember.Controller.extend({
       this.afterFirstHit = true;
     }
   }.observes('currentPath')
-  
+
 });
diff --git a/app/assets/javascripts/discourse/controllers/composer_controller.js b/app/assets/javascripts/discourse/controllers/composer_controller.js
index 6dd25b939ba..d19b946a855 100644
--- a/app/assets/javascripts/discourse/controllers/composer_controller.js
+++ b/app/assets/javascripts/discourse/controllers/composer_controller.js
@@ -1,261 +1,271 @@
-(function() {
+/**
+  This controller supports composing new posts and topics.
 
-  window.Discourse.ComposerController = Ember.Controller.extend(Discourse.Presence, {
-    needs: ['modal', 'topic'],
-    hasReply: false,
-    togglePreview: function() {
-      return this.get('content').togglePreview();
-    },
-    /* Import a quote from the post
-    */
+  @class ComposerController
+  @extends Discourse.Controller
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ComposerController = Discourse.Controller.extend({
+  needs: ['modal', 'topic'],
+  hasReply: false,
 
-    importQuote: function() {
-      return this.get('content').importQuote();
-    },
-    appendText: function(text) {
-      var c;
-      c = this.get('content');
-      if (c) {
-        return c.appendText(text);
-      }
-    },
-    save: function() {
-      var composer,
-        _this = this;
-      composer = this.get('content');
-      composer.set('disableDrafts', true);
-      return composer.save({
-        imageSizes: this.get('view').imageSizes()
-      }).then(function(opts) {
-        opts = opts || {};
-        _this.close();
-        if (composer.get('creatingTopic')) {
-          Discourse.set('currentUser.topic_count', Discourse.get('currentUser.topic_count') + 1);
-        } else {
-          Discourse.set('currentUser.reply_count', Discourse.get('currentUser.reply_count') + 1);
-        }
-        return Discourse.routeTo(opts.post.get('url'));
-      }, function(error) {
-        composer.set('disableDrafts', false);
-        return bootbox.alert(error);
-      });
-    },
-    checkReplyLength: function() {
-      if (this.present('content.reply')) {
-        return this.set('hasReply', true);
+  togglePreview: function() {
+    return this.get('content').togglePreview();
+  },
+
+  // Import a quote from the post
+  importQuote: function() {
+    return this.get('content').importQuote();
+  },
+
+  appendText: function(text) {
+    var c;
+    c = this.get('content');
+    if (c) {
+      return c.appendText(text);
+    }
+  },
+
+  save: function() {
+    var composer,
+      _this = this;
+    composer = this.get('content');
+    composer.set('disableDrafts', true);
+    return composer.save({
+      imageSizes: this.get('view').imageSizes()
+    }).then(function(opts) {
+      opts = opts || {};
+      _this.close();
+      if (composer.get('creatingTopic')) {
+        Discourse.set('currentUser.topic_count', Discourse.get('currentUser.topic_count') + 1);
       } else {
-        return this.set('hasReply', false);
+        Discourse.set('currentUser.reply_count', Discourse.get('currentUser.reply_count') + 1);
       }
-    },
-    saveDraft: function() {
-      var model;
-      model = this.get('content');
-      if (model) {
-        return model.saveDraft();
-      }
-    },
-    /* 
-      Open the reply view
+      Discourse.routeTo(opts.post.get('url'));
+    }, function(error) {
+      composer.set('disableDrafts', false);
+      bootbox.alert(error);
+    });
+  },
 
-      opts:
-      action   - The action we're performing: edit, reply or createTopic
-      post     - The post we're replying to, if present
-      topic    - The topic we're replying to, if present
-      quote    - If we're opening a reply from a quote, the quote we're making
-    */
-
-    open: function(opts) {
-      var composer, promise, view,
-        _this = this;
-      if (!opts) opts = {};
-
-      opts.promise = promise = opts.promise || new RSVP.Promise();
+  checkReplyLength: function() {
+    if (this.present('content.reply')) {
+      this.set('hasReply', true);
+    } else {
       this.set('hasReply', false);
-      if (!opts.draftKey) {
-        alert("composer was opened without a draft key");
-        throw "composer opened without a proper draft key";
-      }
-      /* 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.appendTo(jQuery('#main'));
-        this.set('view', view);
-        /* the next runloop is too soon, need to get the control rendered and then
-        */
+  saveDraft: function() {
+    var model;
+    model = this.get('content');
+    if (model) model.saveDraft();
+  },
 
-        /*  we need to change stuff, otherwise css animations don't kick in
-        */
+  /**
+    Open the composer view
 
-        Em.run.next(function() {
-          return Em.run.next(function() {
-            return _this.open(opts);
-          });
-        });
-        return promise;
-      }
-      composer = this.get('content');
-      if (composer && opts.draftKey !== composer.draftKey && composer.composeState === Discourse.Composer.DRAFT) {
-        this.close();
-        composer = null;
-      }
-      if (composer && !opts.tested && composer.wouldLoseChanges()) {
-        if (composer.composeState === Discourse.Composer.DRAFT && composer.draftKey === opts.draftKey && composer.action === opts.action) {
-          composer.set('composeState', Discourse.Composer.OPEN);
-          promise.resolve();
-          return promise;
-        } else {
-          opts.tested = true;
-          if (!opts.ignoreIfChanged) {
-            this.cancel((function() {
-              return _this.open(opts);
-            }), (function() {
-              return promise.reject();
-            }));
-          }
-          return promise;
-        }
-      }
-      /* we need a draft sequence, without it drafts are bust
-      */
+    @method open
+    @param {Object} opts Options for creating a post
+      @param {String} opts.action The action we're performing: edit, reply or createTopic
+      @param {Discourse.Post} [opts.post] The post we're replying to
+      @param {Discourse.Topic} [opts.topic] The topic we're replying to
+      @param {String} [opts.quote] If we're opening a reply from a quote, the quote we're making
+  **/
+  open: function(opts) {
+    var composer, promise, view,
+      _this = this;
+    if (!opts) opts = {};
 
-      if (opts.draftSequence === void 0) {
-        Discourse.Draft.get(opts.draftKey).then(function(data) {
-          opts.draftSequence = data.draft_sequence;
-          opts.draft = data.draft;
+    opts.promise = promise = opts.promise || new RSVP.Promise();
+    this.set('hasReply', false);
+    if (!opts.draftKey) {
+      alert("composer was opened without a draft key");
+      throw "composer opened without a proper draft key";
+    }
+
+    // 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.appendTo($('#main'));
+      this.set('view', view);
+      // the next runloop is too soon, need to get the control rendered and then
+      //  we need to change stuff, otherwise css animations don't kick in
+      Em.run.next(function() {
+        return Em.run.next(function() {
           return _this.open(opts);
         });
+      });
+      return promise;
+    }
+
+    composer = this.get('content');
+    if (composer && opts.draftKey !== composer.draftKey && composer.composeState === Discourse.Composer.DRAFT) {
+      this.close();
+      composer = null;
+    }
+
+    if (composer && !opts.tested && composer.wouldLoseChanges()) {
+      if (composer.composeState === Discourse.Composer.DRAFT && composer.draftKey === opts.draftKey && composer.action === opts.action) {
+        composer.set('composeState', Discourse.Composer.OPEN);
+        promise.resolve();
+        return promise;
+      } else {
+        opts.tested = true;
+        if (!opts.ignoreIfChanged) {
+          this.cancel((function() {
+            return _this.open(opts);
+          }), (function() {
+            return promise.reject();
+          }));
+        }
         return promise;
       }
-      if (opts.draft) {
-        composer = Discourse.Composer.loadDraft(opts.draftKey, opts.draftSequence, opts.draft);
-        if (composer) {
-          composer.set('topic', opts.topic);
-        }
-      }
-      composer = composer || Discourse.Composer.open(opts);
-      this.set('content', composer);
-      this.set('view.content', composer);
-      promise.resolve();
-      return promise;
-    },
-    wouldLoseChanges: function() {
-      var composer;
-      composer = this.get('content');
-      return composer && composer.wouldLoseChanges();
-    },
-    /* View a new reply we've made
-    */
-
-    viewNewReply: function() {
-      Discourse.routeTo(this.get('createdPost.url'));
-      this.close();
-      return false;
-    },
-    destroyDraft: function() {
-      var key;
-      key = this.get('content.draftKey');
-      if (key) {
-        return Discourse.Draft.clear(key, this.get('content.draftSequence'));
-      }
-    },
-    cancel: function(success, fail) {
-      var _this = this;
-      if (this.get('content.hasMetaData') || ((this.get('content.reply') || "") !== (this.get('content.originalText') || ""))) {
-        bootbox.confirm(Em.String.i18n("post.abandon"), Em.String.i18n("no_value"), Em.String.i18n("yes_value"), function(result) {
-          if (result) {
-            _this.destroyDraft();
-            _this.close();
-            if (typeof success === "function") {
-              return success();
-            }
-          } else {
-            if (typeof fail === "function") {
-              return fail();
-            }
-          }
-        });
-      } else {
-        /* it is possible there is some sort of crazy draft with no body ... just give up on it
-        */
-
-        this.destroyDraft();
-        this.close();
-        if (typeof success === "function") {
-          success();
-        }
-      }
-    },
-    click: function() {
-      if (this.get('content.composeState') === Discourse.Composer.DRAFT) {
-        return this.set('content.composeState', Discourse.Composer.OPEN);
-      }
-    },
-    shrink: function() {
-      if (this.get('content.reply') === this.get('content.originalText')) {
-        return this.close();
-      } else {
-        return this.collapse();
-      }
-    },
-    collapse: function() {
-      this.saveDraft();
-      return this.set('content.composeState', Discourse.Composer.DRAFT);
-    },
-    close: function() {
-      this.set('content', null);
-      return this.set('view.content', null);
-    },
-    closeIfCollapsed: function() {
-      if (this.get('content.composeState') === Discourse.Composer.DRAFT) {
-        return this.close();
-      }
-    },
-    closeAutocomplete: function() {
-      return jQuery('#wmd-input').autocomplete({
-        cancel: true
-      });
-    },
-    /* Toggle the reply view
-    */
-
-    toggle: function() {
-      this.closeAutocomplete();
-      switch (this.get('content.composeState')) {
-        case Discourse.Composer.OPEN:
-          if (this.blank('content.reply') && this.blank('content.title')) {
-            this.close();
-          } else {
-            this.shrink();
-          }
-          break;
-        case Discourse.Composer.DRAFT:
-          this.set('content.composeState', Discourse.Composer.OPEN);
-          break;
-        case Discourse.Composer.SAVING:
-          this.close();
-      }
-      return false;
-    },
-    /* ESC key hit
-    */
-
-    hitEsc: function() {
-      if (this.get('content.composeState') === Discourse.Composer.OPEN) {
-        return this.shrink();
-      }
-    },
-    showOptions: function() {
-      var _ref;
-      return (_ref = this.get('controllers.modal')) ? _ref.show(Discourse.ArchetypeOptionsModalView.create({
-        archetype: this.get('content.archetype'),
-        metaData: this.get('content.metaData')
-      })) : void 0;
     }
-  });
 
-}).call(this);
+    // we need a draft sequence, without it drafts are bust
+    if (opts.draftSequence === void 0) {
+      Discourse.Draft.get(opts.draftKey).then(function(data) {
+        opts.draftSequence = data.draft_sequence;
+        opts.draft = data.draft;
+        return _this.open(opts);
+      });
+      return promise;
+    }
+
+    if (opts.draft) {
+      composer = Discourse.Composer.loadDraft(opts.draftKey, opts.draftSequence, opts.draft);
+      if (composer) {
+        composer.set('topic', opts.topic);
+      }
+    }
+
+    composer = composer || Discourse.Composer.open(opts);
+    this.set('content', composer);
+    this.set('view.content', composer);
+    promise.resolve();
+    return promise;
+  },
+
+  wouldLoseChanges: function() {
+    var composer;
+    composer = this.get('content');
+    return composer && composer.wouldLoseChanges();
+  },
+
+  // View a new reply we've made
+  viewNewReply: function() {
+    Discourse.routeTo(this.get('createdPost.url'));
+    this.close();
+    return false;
+  },
+
+  destroyDraft: function() {
+    var key;
+    key = this.get('content.draftKey');
+    if (key) {
+      return Discourse.Draft.clear(key, this.get('content.draftSequence'));
+    }
+  },
+
+  cancel: function(success, fail) {
+    var _this = this;
+    if (this.get('content.hasMetaData') || ((this.get('content.reply') || "") !== (this.get('content.originalText') || ""))) {
+      bootbox.confirm(Em.String.i18n("post.abandon"), Em.String.i18n("no_value"), Em.String.i18n("yes_value"), function(result) {
+        if (result) {
+          _this.destroyDraft();
+          _this.close();
+          if (typeof success === "function") {
+            return success();
+          }
+        } else {
+          if (typeof fail === "function") {
+            return fail();
+          }
+        }
+      });
+    } else {
+      // it is possible there is some sort of crazy draft with no body ... just give up on it
+      this.destroyDraft();
+      this.close();
+      if (typeof success === "function") {
+        success();
+      }
+    }
+  },
+
+  click: function() {
+    if (this.get('content.composeState') === Discourse.Composer.DRAFT) {
+      return this.set('content.composeState', Discourse.Composer.OPEN);
+    }
+  },
+
+  shrink: function() {
+    if (this.get('content.reply') === this.get('content.originalText')) {
+      return this.close();
+    } else {
+      return this.collapse();
+    }
+  },
+
+  collapse: function() {
+    this.saveDraft();
+    this.set('content.composeState', Discourse.Composer.DRAFT);
+  },
+
+  close: function() {
+    this.set('content', null);
+    this.set('view.content', null);
+  },
+
+  closeIfCollapsed: function() {
+    if (this.get('content.composeState') === Discourse.Composer.DRAFT) {
+      this.close();
+    }
+  },
+
+  closeAutocomplete: function() {
+    $('#wmd-input').autocomplete({ cancel: true });
+  },
+
+  // Toggle the reply view
+  toggle: function() {
+    this.closeAutocomplete();
+    switch (this.get('content.composeState')) {
+      case Discourse.Composer.OPEN:
+        if (this.blank('content.reply') && this.blank('content.title')) {
+          this.close();
+        } else {
+          this.shrink();
+        }
+        break;
+      case Discourse.Composer.DRAFT:
+        this.set('content.composeState', Discourse.Composer.OPEN);
+        break;
+      case Discourse.Composer.SAVING:
+        this.close();
+    }
+    return false;
+  },
+
+  // ESC key hit
+  hitEsc: function() {
+    if (this.get('content.composeState') === Discourse.Composer.OPEN) {
+      this.shrink();
+    }
+  },
+
+  showOptions: function() {
+    var _ref;
+    return (_ref = this.get('controllers.modal')) ? _ref.show(Discourse.ArchetypeOptionsModalView.create({
+      archetype: this.get('content.archetype'),
+      metaData: this.get('content.metaData')
+    })) : void 0;
+  }
+});
+
+
diff --git a/app/assets/javascripts/discourse/controllers/controller.js b/app/assets/javascripts/discourse/controllers/controller.js
index 8ace63d0ab8..73e1e696623 100644
--- a/app/assets/javascripts/discourse/controllers/controller.js
+++ b/app/assets/javascripts/discourse/controllers/controller.js
@@ -1,5 +1,12 @@
-(function() {
+/**
+  A base controller for Discourse that includes Presence support.
+
+  @class Controller 
+  @extends Ember.Controller
+  @namespace Discourse
+  @uses Discourse.Presence
+  @module Discourse
+**/ 
+Discourse.Controller = Ember.Controller.extend(Discourse.Presence);
 
-  Discourse.Controller = Ember.Controller.extend(Discourse.Presence);
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/controllers/header_controller.js b/app/assets/javascripts/discourse/controllers/header_controller.js
index 1938ba9653d..716282bebe7 100644
--- a/app/assets/javascripts/discourse/controllers/header_controller.js
+++ b/app/assets/javascripts/discourse/controllers/header_controller.js
@@ -1,15 +1,21 @@
-(function() {
+/**
+  This controller supports actions on the site header
+
+  @class HeaderController 
+  @extends Discourse.Controller
+  @namespace Discourse
+  @module Discourse
+**/ 
+Discourse.HeaderController = Discourse.Controller.extend({
+  topic: null,
+  showExtraInfo: false,
+
+  toggleStar: function() {
+    var topic = this.get('topic');
+    if (topic) topic.toggleStar();
+    return false;
+  }
+  
+});
 
-  Discourse.HeaderController = Ember.Controller.extend(Discourse.Presence, {
-    topic: null,
-    showExtraInfo: false,
-    toggleStar: function() {
-      var _ref;
-      if (_ref = this.get('topic')) {
-        _ref.toggleStar();
-      }
-      return false;
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/controllers/list_categories_controller.js b/app/assets/javascripts/discourse/controllers/list_categories_controller.js
index a0953661f86..acac8d914b1 100644
--- a/app/assets/javascripts/discourse/controllers/list_categories_controller.js
+++ b/app/assets/javascripts/discourse/controllers/list_categories_controller.js
@@ -1,34 +1,43 @@
-(function() {
+/**
+  This controller supports actions when listing categories
+
+  @class ListCategoriesController 
+  @extends Discourse.ObjectController
+  @namespace Discourse
+  @module Discourse
+**/ 
+Discourse.ListCategoriesController = Discourse.ObjectController.extend({
+  needs: ['modal'],
+
+  categoriesEven: (function() {
+    if (this.blank('categories')) {
+      return Em.A();
+    }
+    return this.get('categories').filter(function(item, index) {
+      return (index % 2) === 0;
+    });
+  }).property('categories.@each'),
+
+  categoriesOdd: (function() {
+    if (this.blank('categories')) {
+      return Em.A();
+    }
+    return this.get('categories').filter(function(item, index) {
+      return (index % 2) === 1;
+    });
+  }).property('categories.@each'),
+
+  editCategory: function(category) {
+    this.get('controllers.modal').show(Discourse.EditCategoryView.create({ category: category }));
+    return false;
+  },
+
+  canEdit: (function() {
+    var u;
+    u = Discourse.get('currentUser');
+    return u && u.admin;
+  }).property()
+  
+});
 
-  Discourse.ListCategoriesController = Ember.ObjectController.extend(Discourse.Presence, {
-    needs: ['modal'],
-    categoriesEven: (function() {
-      if (this.blank('categories')) {
-        return Em.A();
-      }
-      return this.get('categories').filter(function(item, index) {
-        return (index % 2) === 0;
-      });
-    }).property('categories.@each'),
-    categoriesOdd: (function() {
-      if (this.blank('categories')) {
-        return Em.A();
-      }
-      return this.get('categories').filter(function(item, index) {
-        return (index % 2) === 1;
-      });
-    }).property('categories.@each'),
-    editCategory: function(category) {
-      this.get('controllers.modal').show(Discourse.EditCategoryView.create({
-        category: category
-      }));
-      return false;
-    },
-    canEdit: (function() {
-      var u;
-      u = Discourse.get('currentUser');
-      return u && u.admin;
-    }).property()
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/controllers/list_controller.js b/app/assets/javascripts/discourse/controllers/list_controller.js
index b40d04ae37b..1bcb0cfb880 100644
--- a/app/assets/javascripts/discourse/controllers/list_controller.js
+++ b/app/assets/javascripts/discourse/controllers/list_controller.js
@@ -1,97 +1,105 @@
-(function() {
+/**
+  This controller supports actions when listing topics or categories
 
-  Discourse.ListController = Ember.Controller.extend(Discourse.Presence, {
-    currentUserBinding: 'Discourse.currentUser',
-    categoriesBinding: 'Discourse.site.categories',
-    categoryBinding: 'topicList.category',
-    canCreateCategory: false,
-    canCreateTopic: false,
-    needs: ['composer', 'modal', 'listTopics'],
-    availableNavItems: (function() {
-      var hasCategories, loggedOn, summary;
-      summary = this.get('filterSummary');
-      loggedOn = !!Discourse.get('currentUser');
-      hasCategories = !!this.get('categories');
-      return Discourse.SiteSettings.top_menu.split("|").map(function(i) {
-        return Discourse.NavItem.fromText(i, {
-          loggedOn: loggedOn,
-          hasCategories: hasCategories,
-          countSummary: summary
-        });
-      }).filter(function(i) {
-        return i !== null;
+  @class ListController 
+  @extends Discourse.Controller
+  @namespace Discourse
+  @module Discourse
+**/ 
+Discourse.ListController = Discourse.Controller.extend({
+  currentUserBinding: 'Discourse.currentUser',
+  categoriesBinding: 'Discourse.site.categories',
+  categoryBinding: 'topicList.category',
+  canCreateCategory: false,
+  canCreateTopic: false,
+  needs: ['composer', 'modal', 'listTopics'],
+
+  availableNavItems: (function() {
+    var hasCategories, loggedOn, summary;
+    summary = this.get('filterSummary');
+    loggedOn = !!Discourse.get('currentUser');
+    hasCategories = !!this.get('categories');
+    return Discourse.SiteSettings.top_menu.split("|").map(function(i) {
+      return Discourse.NavItem.fromText(i, {
+        loggedOn: loggedOn,
+        hasCategories: hasCategories,
+        countSummary: summary
       });
-    }).property('filterSummary'),
-    load: function(filterMode) {
-      var current,
-        _this = this;
-      this.set('loading', true);
-      if (filterMode === 'categories') {
-        return Ember.Deferred.promise(function(deferred) {
-          return Discourse.CategoryList.list(filterMode).then(function(items) {
-            _this.set('loading', false);
-            _this.set('filterMode', filterMode);
-            _this.set('categoryMode', true);
-            return deferred.resolve(items);
-          });
-        });
-      } else {
-        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) {
-          return Discourse.TopicList.list(current).then(function(items) {
-            _this.set('filterSummary', items.filter_summary);
-            _this.set('filterMode', filterMode);
-            _this.set('loading', false);
-            return deferred.resolve(items);
-          });
-        });
-      }
-    },
-    /* Put in the appropriate page title based on our view
-    */
+    }).filter(function(i) {
+      return i !== null;
+    });
+  }).property('filterSummary'),
 
-    updateTitle: (function() {
-      if (this.get('filterMode') === 'categories') {
-        return Discourse.set('title', Em.String.i18n('categories_list'));
-      } else {
-        if (this.present('category')) {
-          return Discourse.set('title', "" + (this.get('category.name').capitalize()) + " " + (Em.String.i18n('topic.list')));
-        } else {
-          return Discourse.set('title', Em.String.i18n('topic.list'));
-        }
-      }
-    }).observes('filterMode', 'category'),
-    /* Create topic button
-    */
-
-    createTopic: function() {
-      var topicList;
-      topicList = this.get('controllers.listTopics.content');
-      if (!topicList) {
-        return;
-      }
-      return this.get('controllers.composer').open({
-        categoryName: this.get('category.name'),
-        action: Discourse.Composer.CREATE_TOPIC,
-        draftKey: topicList.get('draft_key'),
-        draftSequence: topicList.get('draft_sequence')
+  load: function(filterMode) {
+    var current,
+      _this = this;
+    this.set('loading', true);
+    if (filterMode === 'categories') {
+      return Ember.Deferred.promise(function(deferred) {
+        return Discourse.CategoryList.list(filterMode).then(function(items) {
+          _this.set('loading', false);
+          _this.set('filterMode', filterMode);
+          _this.set('categoryMode', true);
+          return deferred.resolve(items);
+        });
+      });
+    } else {
+      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) {
+        return Discourse.TopicList.list(current).then(function(items) {
+          _this.set('filterSummary', items.filter_summary);
+          _this.set('filterMode', filterMode);
+          _this.set('loading', false);
+          return deferred.resolve(items);
+        });
       });
-    },
-    createCategory: function() {
-      var _ref;
-      return (_ref = this.get('controllers.modal')) ? _ref.show(Discourse.EditCategoryView.create()) : void 0;
     }
-  });
+  },
+
+  // Put in the appropriate page title based on our view
+  updateTitle: (function() {
+    if (this.get('filterMode') === 'categories') {
+      return Discourse.set('title', Em.String.i18n('categories_list'));
+    } else {
+      if (this.present('category')) {
+        return Discourse.set('title', "" + (this.get('category.name').capitalize()) + " " + (Em.String.i18n('topic.list')));
+      } else {
+        return Discourse.set('title', Em.String.i18n('topic.list'));
+      }
+    }
+  }).observes('filterMode', 'category'),
+
+  // Create topic button
+  createTopic: function() {
+    var topicList;
+    topicList = this.get('controllers.listTopics.content');
+    if (!topicList) {
+      return;
+    }
+    return this.get('controllers.composer').open({
+      categoryName: this.get('category.name'),
+      action: Discourse.Composer.CREATE_TOPIC,
+      draftKey: topicList.get('draft_key'),
+      draftSequence: topicList.get('draft_sequence')
+    });
+  },
+
+  createCategory: function() {
+    var _ref;
+    return (_ref = this.get('controllers.modal')) ? _ref.show(Discourse.EditCategoryView.create()) : void 0;
+  }
+
+});
+
+Discourse.ListController.reopenClass({
+  filters: ['popular', 'favorited', 'read', 'unread', 'new', 'posted']
+});
 
-  Discourse.ListController.reopenClass({
-    filters: ['popular', 'favorited', 'read', 'unread', 'new', 'posted']
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/controllers/list_topics_controller.js b/app/assets/javascripts/discourse/controllers/list_topics_controller.js
index d966c1ac021..a154a890618 100644
--- a/app/assets/javascripts/discourse/controllers/list_topics_controller.js
+++ b/app/assets/javascripts/discourse/controllers/list_topics_controller.js
@@ -1,73 +1,73 @@
-(function() {
+/**
+  This controller supports actions when listing topics or categories
 
-  Discourse.ListTopicsController = Ember.ObjectController.extend({
-    needs: ['list', 'composer'],
-    /* If we're changing our channel
-    */
+  @class ListTopicsController 
+  @extends Discourse.ObjectController
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ListTopicsController = Discourse.ObjectController.extend({
+  needs: ['list', 'composer'],
+  // If we're changing our channel
+  previousChannel: null,
 
-    previousChannel: null,
-    popular: (function() {
-      return this.get('content.filter') === 'popular';
-    }).property('content.filter'),
-    filterModeChanged: (function() {
-      /* Unsubscribe from a previous channel if necessary
-      */
+  popular: (function() {
+    return this.get('content.filter') === 'popular';
+  }).property('content.filter'),
 
-      var channel, filterMode, previousChannel,
-        _this = this;
-      if (previousChannel = this.get('previousChannel')) {
-        Discourse.MessageBus.unsubscribe("/" + previousChannel);
-        this.set('previousChannel', null);
-      }
-      filterMode = this.get('controllers.list.filterMode');
-      if (!filterMode) {
-        return;
-      }
-      channel = filterMode;
-      Discourse.MessageBus.subscribe("/" + channel, function(data) {
-        return _this.get('content').insert(data);
-      });
-      return this.set('previousChannel', channel);
-    }).observes('controllers.list.filterMode'),
-    draftLoaded: (function() {
-      var draft;
-      draft = this.get('content.draft');
-      if (draft) {
-        return this.get('controllers.composer').open({
-          draft: draft,
-          draftKey: this.get('content.draft_key'),
-          draftSequence: this.get('content.draft_sequence'),
-          ignoreIfChanged: true
-        });
-      }
-    }).observes('content.draft'),
-    /* Star a topic
-    */
-
-    toggleStar: function(topic) {
-      topic.toggleStar();
-      return false;
-    },
-    createTopic: function() {
-      this.get('controllers.list').createTopic();
-      return false;
-    },
-    observer: (function() {
-      return this.set('filterMode', this.get('controllser.list.filterMode'));
-    }).observes('controller.list.filterMode'),
-    /* Show newly inserted topics
-    */
-
-    showInserted: function(e) {
-      /* Move inserted into topics
-      */
-      this.get('content.topics').unshiftObjects(this.get('content.inserted'));
-      /* Clear inserted
-      */
-
-      this.set('content.inserted', Em.A());
-      return false;
+  filterModeChanged: (function() {
+    // Unsubscribe from a previous channel if necessary
+    var channel, filterMode, previousChannel,
+      _this = this;
+    if (previousChannel = this.get('previousChannel')) {
+      Discourse.MessageBus.unsubscribe("/" + previousChannel);
+      this.set('previousChannel', null);
     }
-  });
+    filterMode = this.get('controllers.list.filterMode');
+    if (!filterMode) {
+      return;
+    }
+    channel = filterMode;
+    Discourse.MessageBus.subscribe("/" + channel, function(data) {
+      return _this.get('content').insert(data);
+    });
+    return this.set('previousChannel', channel);
+  }).observes('controllers.list.filterMode'),
+  draftLoaded: (function() {
+    var draft;
+    draft = this.get('content.draft');
+    if (draft) {
+      return this.get('controllers.composer').open({
+        draft: draft,
+        draftKey: this.get('content.draft_key'),
+        draftSequence: this.get('content.draft_sequence'),
+        ignoreIfChanged: true
+      });
+    }
+  }).observes('content.draft'),
+
+  // Star a topic
+  toggleStar: function(topic) {
+    topic.toggleStar();
+  },
+
+  createTopic: function() {
+    this.get('controllers.list').createTopic();
+  },
+
+  observer: (function() {
+    return this.set('filterMode', this.get('controllser.list.filterMode'));
+  }).observes('controller.list.filterMode'),
+
+  // Show newly inserted topics
+  showInserted: function(e) {
+    // Move inserted into topics
+    this.get('content.topics').unshiftObjects(this.get('content.inserted'));
+
+    // Clear inserted
+    this.set('content.inserted', Em.A());
+    return false;
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/controllers/modal_controller.js b/app/assets/javascripts/discourse/controllers/modal_controller.js
index 5064c67f21d..987b8c5545a 100644
--- a/app/assets/javascripts/discourse/controllers/modal_controller.js
+++ b/app/assets/javascripts/discourse/controllers/modal_controller.js
@@ -1,9 +1,15 @@
-(function() {
+/**
+  This controller supports actions related to showing modals
+
+  @class ModalController 
+  @extends Discourse.Controller
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ModalController = Discourse.Controller.extend({
+  show: function(view) {
+    this.set('currentView', view);
+  }
+});
 
-  Discourse.ModalController = Ember.Controller.extend(Discourse.Presence, {
-    show: function(view) {
-      return this.set('currentView', view);
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/controllers/object_controller.js b/app/assets/javascripts/discourse/controllers/object_controller.js
new file mode 100644
index 00000000000..32ae3f9ab2a
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/object_controller.js
@@ -0,0 +1,12 @@
+/**
+  A custom object controller for Discourse
+
+  @class ObjectController 
+  @extends Ember.ObjectController
+  @namespace Discourse
+  @uses Discourse.Presence
+  @module Discourse
+**/ 
+Discourse.ObjectController = Ember.ObjectController.extend(Discourse.Presence);
+
+
diff --git a/app/assets/javascripts/discourse/controllers/preferences_controller.js b/app/assets/javascripts/discourse/controllers/preferences_controller.js
index 6bc4b92a21a..782269f620c 100644
--- a/app/assets/javascripts/discourse/controllers/preferences_controller.js
+++ b/app/assets/javascripts/discourse/controllers/preferences_controller.js
@@ -1,158 +1,89 @@
-(function() {
+/**
+  This controller supports actions related to updating one's preferences
 
-  Discourse.PreferencesController = Ember.ObjectController.extend(Discourse.Presence, {
-    /* By default we haven't saved anything
-    */
+  @class PreferencesController
+  @extends Discourse.ObjectController
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.PreferencesController = Discourse.ObjectController.extend({
+  // By default we haven't saved anything
+  saved: false,
 
-    saved: false,
-    saveDisabled: (function() {
-      if (this.get('saving')) {
-        return true;
-      }
-      if (this.blank('content.name')) {
-        return true;
-      }
-      if (this.blank('content.email')) {
-        return true;
-      }
-      return false;
-    }).property('saving', 'content.name', 'content.email'),
-    digestFrequencies: (function() {
-      var freqs;
-      freqs = Em.A();
-      freqs.addObject({
-        name: Em.String.i18n('user.email_digests.daily'),
-        value: 1
-      });
-      freqs.addObject({
-        name: Em.String.i18n('user.email_digests.weekly'),
-        value: 7
-      });
-      freqs.addObject({
-        name: Em.String.i18n('user.email_digests.bi_weekly'),
-        value: 14
-      });
-      return freqs;
-    }).property(),
-    autoTrackDurations: (function() {
-      var freqs;
-      freqs = Em.A();
-      freqs.addObject({
-        name: Em.String.i18n('user.auto_track_options.never'),
-        value: -1
-      });
-      freqs.addObject({
-        name: Em.String.i18n('user.auto_track_options.always'),
-        value: 0
-      });
-      freqs.addObject({
-        name: Em.String.i18n('user.auto_track_options.after_n_seconds', {
-          count: 30
-        }),
-        value: 30000
-      });
-      freqs.addObject({
-        name: Em.String.i18n('user.auto_track_options.after_n_minutes', {
-          count: 1
-        }),
-        value: 60000
-      });
-      freqs.addObject({
-        name: Em.String.i18n('user.auto_track_options.after_n_minutes', {
-          count: 2
-        }),
-        value: 120000
-      });
-      freqs.addObject({
-        name: Em.String.i18n('user.auto_track_options.after_n_minutes', {
-          count: 3
-        }),
-        value: 180000
-      });
-      freqs.addObject({
-        name: Em.String.i18n('user.auto_track_options.after_n_minutes', {
-          count: 4
-        }),
-        value: 240000
-      });
-      freqs.addObject({
-        name: Em.String.i18n('user.auto_track_options.after_n_minutes', {
-          count: 5
-        }),
-        value: 300000
-      });
-      freqs.addObject({
-        name: Em.String.i18n('user.auto_track_options.after_n_minutes', {
-          count: 10
-        }),
-        value: 600000
-      });
-      return freqs;
-    }).property(),
-    considerNewTopicOptions: (function() {
-      var opts;
-      opts = Em.A();
-      opts.addObject({
-        name: Em.String.i18n('user.new_topic_duration.not_viewed'),
-        value: -1
-      });
-      opts.addObject({
-        name: Em.String.i18n('user.new_topic_duration.after_n_days', {
-          count: 1
-        }),
-        value: 60 * 24
-      });
-      opts.addObject({
-        name: Em.String.i18n('user.new_topic_duration.after_n_days', {
-          count: 2
-        }),
-        value: 60 * 48
-      });
-      opts.addObject({
-        name: Em.String.i18n('user.new_topic_duration.after_n_weeks', {
-          count: 1
-        }),
-        value: 7 * 60 * 24
-      });
-      opts.addObject({
-        name: Em.String.i18n('user.new_topic_duration.last_here'),
-        value: -2
-      });
-      return opts;
-    }).property(),
-    save: function() {
-      var _this = this;
-      this.set('saving', true);
-      this.set('saved', false);
-      /* Cook the bio for preview
-      */
+  saveDisabled: (function() {
+    if (this.get('saving')) return true;
+    if (this.blank('content.name')) return true;
+    if (this.blank('content.email')) return true;
+    return false;
+  }).property('saving', 'content.name', 'content.email'),
 
-      return this.get('content').save(function(result) {
-        _this.set('saving', false);
-        if (result) {
-          _this.set('content.bio_cooked', Discourse.Utilities.cook(_this.get('content.bio_raw')));
-          return _this.set('saved', true);
-        } else {
-          return alert('failed');
-        }
+  digestFrequencies: (function() {
+    var freqs;
+    freqs = Em.A();
+    freqs.addObject({ name: Em.String.i18n('user.email_digests.daily'), value: 1 });
+    freqs.addObject({ name: Em.String.i18n('user.email_digests.weekly'), value: 7 });
+    freqs.addObject({ name: Em.String.i18n('user.email_digests.bi_weekly'), value: 14 });
+    return freqs;
+  }).property(),
+
+  autoTrackDurations: (function() {
+    var freqs;
+    freqs = Em.A();
+    freqs.addObject({ name: Em.String.i18n('user.auto_track_options.never'), value: -1 });
+    freqs.addObject({ name: Em.String.i18n('user.auto_track_options.always'), value: 0 });
+    freqs.addObject({ name: Em.String.i18n('user.auto_track_options.after_n_seconds', { count: 30 }), value: 30000 });
+    freqs.addObject({ name: Em.String.i18n('user.auto_track_options.after_n_minutes', { count: 1 }), value: 60000 });
+    freqs.addObject({ name: Em.String.i18n('user.auto_track_options.after_n_minutes', { count: 2 }), value: 120000 });
+    freqs.addObject({ name: Em.String.i18n('user.auto_track_options.after_n_minutes', { count: 3 }), value: 180000 });
+    freqs.addObject({ name: Em.String.i18n('user.auto_track_options.after_n_minutes', { count: 4 }), value: 240000 });
+    freqs.addObject({ name: Em.String.i18n('user.auto_track_options.after_n_minutes', { count: 5 }), value: 300000 });
+    freqs.addObject({ name: Em.String.i18n('user.auto_track_options.after_n_minutes', { count: 10 }), value: 600000 });
+    return freqs;
+  }).property(),
+
+  considerNewTopicOptions: (function() {
+    var opts;
+    opts = Em.A();
+    opts.addObject({ name: Em.String.i18n('user.new_topic_duration.not_viewed'), value: -1 });
+    opts.addObject({ name: Em.String.i18n('user.new_topic_duration.after_n_days', { count: 1 }), value: 60 * 24 });
+    opts.addObject({ name: Em.String.i18n('user.new_topic_duration.after_n_days', { count: 2 }), value: 60 * 48 });
+    opts.addObject({ name: Em.String.i18n('user.new_topic_duration.after_n_weeks', { count: 1 }), value: 7 * 60 * 24 });
+    opts.addObject({ name: Em.String.i18n('user.new_topic_duration.last_here'), value: -2 });
+    return opts;
+  }).property(),
+
+  save: function() {
+    var _this = this;
+    this.set('saving', true);
+    this.set('saved', false);
+
+    // Cook the bio for preview
+    return this.get('content').save(function(result) {
+      _this.set('saving', false);
+      if (result) {
+        _this.set('content.bio_cooked', Discourse.Utilities.cook(_this.get('content.bio_raw')));
+        return _this.set('saved', true);
+      } else {
+        return alert('failed');
+      }
+    });
+  },
+
+  saveButtonText: (function() {
+    if (this.get('saving')) return Em.String.i18n('saving');
+    return Em.String.i18n('save');
+  }).property('saving'),
+
+  changePassword: function() {
+    var _this = this;
+    if (!this.get('passwordProgress')) {
+      this.set('passwordProgress', '(generating email)');
+      return this.get('content').changePassword(function(message) {
+        _this.set('changePasswordProgress', false);
+        return _this.set('passwordProgress', "(" + message + ")");
       });
-    },
-    saveButtonText: (function() {
-      if (this.get('saving')) {
-        return Em.String.i18n('saving');
-      }
-      return Em.String.i18n('save');
-    }).property('saving'),
-    changePassword: function() {
-      var _this = this;
-      if (!this.get('passwordProgress')) {
-        this.set('passwordProgress', '(generating email)');
-        return this.get('content').changePassword(function(message) {
-          _this.set('changePasswordProgress', false);
-          return _this.set('passwordProgress', "(" + message + ")");
-        });
-      }
     }
-  });
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/controllers/preferences_email_controller.js b/app/assets/javascripts/discourse/controllers/preferences_email_controller.js
index 46ff3bd2587..e6dda6c8aaf 100644
--- a/app/assets/javascripts/discourse/controllers/preferences_email_controller.js
+++ b/app/assets/javascripts/discourse/controllers/preferences_email_controller.js
@@ -1,48 +1,50 @@
-(function() {
+/**
+  This controller supports actions related to updating one's email address
+
+  @class PreferencesEmailController
+  @extends Discourse.ObjectController
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.PreferencesEmailController = Discourse.ObjectController.extend({
+  taken: false,
+  saving: false,
+  error: false,
+  success: false,
+
+  saveDisabled: (function() {
+    if (this.get('saving')) return true;
+    if (this.blank('newEmail')) return true;
+    if (this.get('taken')) return true;
+    if (this.get('unchanged')) return true;
+  }).property('newEmail', 'taken', 'unchanged', 'saving'),
+
+  unchanged: (function() {
+    return this.get('newEmail') === this.get('content.email');
+  }).property('newEmail', 'content.email'),
+
+  initializeEmail: (function() {
+    this.set('newEmail', this.get('content.email'));
+  }).observes('content.email'),
+
+  saveButtonText: (function() {
+    if (this.get('saving')) return Em.String.i18n("saving");
+    return Em.String.i18n("user.change_email.action");
+  }).property('saving'),
+
+  changeEmail: function() {
+    var _this = this;
+    this.set('saving', true);
+    return this.get('content').changeEmail(this.get('newEmail')).then(function() {
+      return _this.set('success', true);
+    }, function() {
+      /* Error
+      */
+      _this.set('error', true);
+      return _this.set('saving', false);
+    });
+  }
+
+});
 
-  Discourse.PreferencesEmailController = Ember.ObjectController.extend(Discourse.Presence, {
-    taken: false,
-    saving: false,
-    error: false,
-    success: false,
-    saveDisabled: (function() {
-      if (this.get('saving')) {
-        return true;
-      }
-      if (this.blank('newEmail')) {
-        return true;
-      }
-      if (this.get('taken')) {
-        return true;
-      }
-      if (this.get('unchanged')) {
-        return true;
-      }
-    }).property('newEmail', 'taken', 'unchanged', 'saving'),
-    unchanged: (function() {
-      return this.get('newEmail') === this.get('content.email');
-    }).property('newEmail', 'content.email'),
-    initializeEmail: (function() {
-      return this.set('newEmail', this.get('content.email'));
-    }).observes('content.email'),
-    saveButtonText: (function() {
-      if (this.get('saving')) {
-        return Em.String.i18n("saving");
-      }
-      return Em.String.i18n("user.change_email.action");
-    }).property('saving'),
-    changeEmail: function() {
-      var _this = this;
-      this.set('saving', true);
-      return this.get('content').changeEmail(this.get('newEmail')).then(function() {
-        return _this.set('success', true);
-      }, function() {
-        /* Error
-        */
-        _this.set('error', true);
-        return _this.set('saving', false);
-      });
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/controllers/preferences_username_controller.js b/app/assets/javascripts/discourse/controllers/preferences_username_controller.js
index 61e112343e8..c6d79a6ceac 100644
--- a/app/assets/javascripts/discourse/controllers/preferences_username_controller.js
+++ b/app/assets/javascripts/discourse/controllers/preferences_username_controller.js
@@ -1,71 +1,66 @@
-(function() {
+/**
+  This controller supports actions related to updating one's username
+
+  @class PreferencesUsernameController
+  @extends Discourse.ObjectController
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.PreferencesUsernameController = Discourse.ObjectController.extend({
+  taken: false,
+  saving: false,
+  error: false,
+  errorMessage: null,
+
+  saveDisabled: (function() {
+    if (this.get('saving')) return true;
+    if (this.blank('newUsername')) return true;
+    if (this.get('taken')) return true;
+    if (this.get('unchanged')) return true;
+    if (this.get('errorMessage')) return true;
+    return false;
+  }).property('newUsername', 'taken', 'errorMessage', 'unchanged', 'saving'),
+
+  unchanged: (function() {
+    return this.get('newUsername') === this.get('content.username');
+  }).property('newUsername', 'content.username'),
+
+  checkTaken: (function() {
+    var _this = this;
+    this.set('taken', false);
+    this.set('errorMessage', null);
+    if (this.blank('newUsername')) return;
+    if (this.get('unchanged')) return;
+    Discourse.User.checkUsername(this.get('newUsername')).then(function(result) {
+      if (result.errors) {
+        return _this.set('errorMessage', result.errors.join(' '));
+      } else if (result.available === false) {
+        return _this.set('taken', true);
+      }
+    });
+  }).observes('newUsername'),
+
+  saveButtonText: (function() {
+    if (this.get('saving')) return Em.String.i18n("saving");
+    return Em.String.i18n("user.change_username.action");
+  }).property('saving'),
+
+  changeUsername: function() {
+    var _this = this;
+    return bootbox.confirm(Em.String.i18n("user.change_username.confirm"), Em.String.i18n("no_value"), Em.String.i18n("yes_value"), function(result) {
+      if (result) {
+        _this.set('saving', true);
+        return _this.get('content').changeUsername(_this.get('newUsername')).then(function() {
+          window.location = "/users/" + (_this.get('newUsername').toLowerCase()) + "/preferences";
+        }, function() {
+          /* Error
+          */
+          _this.set('error', true);
+          return _this.set('saving', false);
+        });
+      }
+    });
+  }
+});
 
-  Discourse.PreferencesUsernameController = Ember.ObjectController.extend(Discourse.Presence, {
-    taken: false,
-    saving: false,
-    error: false,
-    errorMessage: null,
-    saveDisabled: (function() {
-      if (this.get('saving')) {
-        return true;
-      }
-      if (this.blank('newUsername')) {
-        return true;
-      }
-      if (this.get('taken')) {
-        return true;
-      }
-      if (this.get('unchanged')) {
-        return true;
-      }
-      if (this.get('errorMessage')) {
-        return true;
-      }
-      return false;
-    }).property('newUsername', 'taken', 'errorMessage', 'unchanged', 'saving'),
-    unchanged: (function() {
-      return this.get('newUsername') === this.get('content.username');
-    }).property('newUsername', 'content.username'),
-    checkTaken: (function() {
-      var _this = this;
-      this.set('taken', false);
-      this.set('errorMessage', null);
-      if (this.blank('newUsername')) {
-        return;
-      }
-      if (this.get('unchanged')) {
-        return;
-      }
-      return Discourse.User.checkUsername(this.get('newUsername')).then(function(result) {
-        if (result.errors) {
-          return _this.set('errorMessage', result.errors.join(' '));
-        } else if (result.available === false) {
-          return _this.set('taken', true);
-        }
-      });
-    }).observes('newUsername'),
-    saveButtonText: (function() {
-      if (this.get('saving')) {
-        return Em.String.i18n("saving");
-      }
-      return Em.String.i18n("user.change_username.action");
-    }).property('saving'),
-    changeUsername: function() {
-      var _this = this;
-      return bootbox.confirm(Em.String.i18n("user.change_username.confirm"), Em.String.i18n("no_value"), Em.String.i18n("yes_value"), function(result) {
-        if (result) {
-          _this.set('saving', true);
-          return _this.get('content').changeUsername(_this.get('newUsername')).then(function() {
-            window.location = "/users/" + (_this.get('newUsername').toLowerCase()) + "/preferences";
-          }, function() {
-            /* Error
-            */
-            _this.set('error', true);
-            return _this.set('saving', false);
-          });
-        }
-      });
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/controllers/quote_button_controller.js b/app/assets/javascripts/discourse/controllers/quote_button_controller.js
index 5318186bf97..3c4e9d5e1b7 100644
--- a/app/assets/javascripts/discourse/controllers/quote_button_controller.js
+++ b/app/assets/javascripts/discourse/controllers/quote_button_controller.js
@@ -1,86 +1,86 @@
-(function() {
+/**
+  This controller supports the pop up quote button
 
-  Discourse.QuoteButtonController = Discourse.Controller.extend({
-    needs: ['topic', 'composer'],
-    started: null,
-    /* If the buffer is cleared, clear out other state (post)
-    */
+  @class QuoteButtonController
+  @extends Discourse.Controller
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.QuoteButtonController = Discourse.Controller.extend({
+  needs: ['topic', 'composer'],
+  started: null,
 
-    bufferChanged: (function() {
-      if (this.blank('buffer')) {
-        return this.set('post', null);
-      }
-    }).observes('buffer'),
-    mouseDown: function(e) {
-      this.started = [e.pageX, e.pageY];
-    },
-    mouseUp: function(e) {
-      if (this.started[1] > e.pageY) {
-        this.started = [e.pageX, e.pageY];
-      }
-    },
-    selectText: function(e) {
-      var $quoteButton, left, selectedText, top;
-      if (!Discourse.get('currentUser')) {
-        return;
-      }
-      if (!this.get('controllers.topic.content.can_create_post')) {
-        return;
-      }
-      selectedText = Discourse.Utilities.selectedText();
-      if (this.get('buffer') === selectedText) {
-        return;
-      }
-      if (this.get('lastSelected') === selectedText) {
-        return;
-      }
-      this.set('post', e.context);
-      this.set('buffer', selectedText);
-      top = e.pageY + 5;
-      left = e.pageX + 5;
-      $quoteButton = jQuery('.quote-button');
-      if (this.started) {
-        top = this.started[1] - 50;
-        left = ((left - this.started[0]) / 2) + this.started[0] - ($quoteButton.width() / 2);
-      }
-      $quoteButton.css({
-        top: top,
-        left: left
-      });
-      this.started = null;
-      return false;
-    },
-    quoteText: function(e) {
-      var buffer, composerController, composerOpts, composerPost, post, quotedText,
-        _this = this;
-      e.stopPropagation();
-      post = this.get('post');
-      composerController = this.get('controllers.composer');
-      composerOpts = {
-        post: post,
-        action: Discourse.Composer.REPLY,
-        draftKey: this.get('post.topic.draft_key')
-      };
-      /* If the composer is associated with a different post, we don't change it.
-      */
-
-      if (composerPost = composerController.get('content.post')) {
-        if (composerPost.get('id') !== this.get('post.id')) {
-          composerOpts.post = composerPost;
-        }
-      }
-      buffer = this.get('buffer');
-      quotedText = Discourse.BBCode.buildQuoteBBCode(post, buffer);
-      if (composerController.wouldLoseChanges()) {
-        composerController.appendText(quotedText);
-      } else {
-        composerController.open(composerOpts).then(function() {
-          return composerController.appendText(quotedText);
-        });
-      }
-      this.set('buffer', '');
-      return false;
+  // If the buffer is cleared, clear out other state (post)
+  bufferChanged: (function() {
+    if (this.blank('buffer')) {
+      return this.set('post', null);
     }
-  });
+  }).observes('buffer'),
 
-}).call(this);
+  mouseDown: function(e) {
+    this.started = [e.pageX, e.pageY];
+  },
+
+  mouseUp: function(e) {
+    if (this.started[1] > e.pageY) {
+      this.started = [e.pageX, e.pageY];
+    }
+  },
+
+  selectText: function(e) {
+    var $quoteButton, left, selectedText, top;
+    if (!Discourse.get('currentUser')) return;
+    if (!this.get('controllers.topic.content.can_create_post')) return;
+
+    selectedText = Discourse.Utilities.selectedText();
+    if (this.get('buffer') === selectedText) return;
+    if (this.get('lastSelected') === selectedText) return;
+    this.set('post', e.context);
+    this.set('buffer', selectedText);
+    top = e.pageY + 5;
+    left = e.pageX + 5;
+    $quoteButton = $('.quote-button');
+    if (this.started) {
+      top = this.started[1] - 50;
+      left = ((left - this.started[0]) / 2) + this.started[0] - ($quoteButton.width() / 2);
+    }
+    $quoteButton.css({
+      top: top,
+      left: left
+    });
+    this.started = null;
+    return false;
+  },
+
+  quoteText: function(e) {
+    var buffer, composerController, composerOpts, composerPost, post, quotedText,
+      _this = this;
+    e.stopPropagation();
+    post = this.get('post');
+    composerController = this.get('controllers.composer');
+    composerOpts = {
+      post: post,
+      action: Discourse.Composer.REPLY,
+      draftKey: this.get('post.topic.draft_key')
+    };
+
+    // If the composer is associated with a different post, we don't change it.
+    if (composerPost = composerController.get('content.post')) {
+      if (composerPost.get('id') !== this.get('post.id')) {
+        composerOpts.post = composerPost;
+      }
+    }
+    buffer = this.get('buffer');
+    quotedText = Discourse.BBCode.buildQuoteBBCode(post, buffer);
+
+    if (composerController.wouldLoseChanges()) {
+      composerController.appendText(quotedText);
+    } else {
+      composerController.open(composerOpts).then(function() {
+        return composerController.appendText(quotedText);
+      });
+    }
+    this.set('buffer', '');
+    return false;
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/share_controller.js b/app/assets/javascripts/discourse/controllers/share_controller.js
index 2ca342f2fff..93811b37e55 100644
--- a/app/assets/javascripts/discourse/controllers/share_controller.js
+++ b/app/assets/javascripts/discourse/controllers/share_controller.js
@@ -1,29 +1,33 @@
-(function() {
+/**
+  This controller supports the "share" link controls
 
-  Discourse.ShareController = Ember.Controller.extend({
-    /* When the user clicks the post number, we pop up a share box
-    */
+  @class ShareController
+  @extends Discourse.Controller
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ShareController = Discourse.Controller.extend({
 
-    shareLink: function(e, url) {
-      var x;
-      x = e.pageX - 150;
-      if (x < 25) {
-        x = 25;
-      }
-      jQuery('#share-link').css({
-        left: "" + x + "px",
-        top: "" + (e.pageY - 100) + "px"
-      });
-      this.set('link', url);
-      return false;
-    },
-    /* Close the share controller
-    */
-
-    close: function() {
-      this.set('link', '');
-      return false;
+  // When the user clicks the post number, we pop up a share box
+  shareLink: function(e, url) {
+    var x;
+    x = e.pageX - 150;
+    if (x < 25) {
+      x = 25;
     }
-  });
+    $('#share-link').css({
+      left: "" + x + "px",
+      top: "" + (e.pageY - 100) + "px"
+    });
+    this.set('link', url);
+    return false;
+  },
+
+  // Close the share controller
+  close: function() {
+    this.set('link', '');
+    return false;
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/controllers/static_controller.js b/app/assets/javascripts/discourse/controllers/static_controller.js
index 0011e522058..9856f880db7 100644
--- a/app/assets/javascripts/discourse/controllers/static_controller.js
+++ b/app/assets/javascripts/discourse/controllers/static_controller.js
@@ -1,32 +1,38 @@
-(function() {
+/**
+  This controller supports displaying static content.
 
-  Discourse.StaticController = Ember.Controller.extend({
-    content: null,
-    loadPath: function(path) {
-      var $preloaded, text,
-        _this = this;
-      this.set('content', null);
-      /* Load from 
    
       
    
         
         
    {{username}}
    
         {{date created_at}}
diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index 29d9e298d56..89790ae8da4 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -28,9 +28,9 @@
 
     
    
       
    
-        {{avatar this imageSize="large"}}
+        {{avatar this imageSize="large"}}
         
    {{breakUp username}}
    
-        
+
         
    
           {{date created_at}}
         
    
@@ -38,14 +38,14 @@
           
    
             
               
-              {{editCount}} 
+              {{editCount}}
             
           
    
-        {{/if}}        
+        {{/if}}
       
    
-    
        
+    
    
 
-    
               
+    
    
       
    
         {{view Discourse.PrependPostView postBinding="this"}}
         
    {{{cooked}}}
    
diff --git a/app/assets/javascripts/discourse/templates/suggested_topic.js.handlebars b/app/assets/javascripts/discourse/templates/suggested_topic.js.handlebars
index 93d172806c2..f9f33a613d9 100644
--- a/app/assets/javascripts/discourse/templates/suggested_topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/suggested_topic.js.handlebars
@@ -1,16 +1,16 @@
 {{#with view.content}}
   {{#group}}
   
-    {{{unbound fancy_title}}}
+    {{{unbound fancy_title}}}
     {{#if unread}}
       {{unbound unread}}
     {{/if}}
     {{#if new_posts}}
       {{unbound new_posts}}
-    {{/if}}           
+    {{/if}}
     {{#if unseen}}
       
-    {{/if}}    
+    {{/if}}
   
   
     {{categoryLink category}}
@@ -22,10 +22,10 @@
       {{like_count}} 
     {{/if}}
   
-  
-  {{number views numberKey="views_long"}}  
-  
-  {{#if singlePost}}          
+
+  {{number views numberKey="views_long"}}
+
+  {{#if singlePost}}
     
       {{{age}}}
     
@@ -36,7 +36,7 @@
     
     
       {{{last_post_age}}}
-                    
+    
   {{/if}}
 
   {{/group}}
diff --git a/app/assets/javascripts/discourse/views/actions_history_view.js b/app/assets/javascripts/discourse/views/actions_history_view.js
index 76d7c94c240..7958a3a30c5 100644
--- a/app/assets/javascripts/discourse/views/actions_history_view.js
+++ b/app/assets/javascripts/discourse/views/actions_history_view.js
@@ -1,82 +1,91 @@
-(function() {
+/**
+  This view handles rendering of what actions have been taken on a post. It uses
+  buffer rendering for performance rather than a template.
 
-  window.Discourse.ActionsHistoryView = Discourse.View.extend({
-    tagName: 'section',
-    classNameBindings: [':post-actions', 'hidden'],
-    hidden: (function() {
-      return this.blank('content');
-    }).property('content.@each'),
-    usersChanged: (function() {
-      return this.rerender();
-    }).observes('content.@each', 'content.users.@each'),
-    /* This was creating way too many bound ifs and subviews in the handlebars version.
-    */
+  @class ActionsHistoryView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ActionsHistoryView = Discourse.View.extend({
+  tagName: 'section',
+  classNameBindings: [':post-actions', 'hidden'],
 
-    render: function(buffer) {
-      if (!this.present('content')) {
-        return;
-      }
-      return this.get('content').forEach(function(c) {
-        var alsoName;
-        buffer.push("
    ");
-        if (c.get('users')) {
-          c.get('users').forEach(function(u) {
-            buffer.push("");
-            buffer.push(Discourse.Utilities.avatarImg({
-              size: 'small',
-              username: u.get('username'),
-              avatarTemplate: u.get('avatar_template')
-            }));
-            return buffer.push("");
-          });
-          buffer.push(" " + (c.get('actionType.long_form')) + ".");
-        } else {
-          buffer.push("" + (c.get('description')) + ".");
-        }
-        if (c.get('can_act')) {
-          alsoName = Em.String.i18n("post.actions.it_too", {
-            alsoName: c.get('actionType.alsoName')
-          });
-          buffer.push(" " + alsoName + ".");
-        }
-        if (c.get('can_undo')) {
-          alsoName = Em.String.i18n("post.actions.undo", {
-            alsoName: c.get('actionType.alsoNameLower')
-          });
-          buffer.push(" " + alsoName + ".");
-        }
-        if (c.get('can_clear_flags')) {
-          buffer.push(" " + (Em.String.i18n("post.actions.clear_flags", {
-            count: c.count
-          })) + ".");
-        }
-        return buffer.push("
    ");
-      });
-    },
-    click: function(e) {
-      var $target, actionTypeId;
-      $target = jQuery(e.target);
-      if (actionTypeId = $target.data('clear-flags')) {
-        this.get('controller').clearFlags(this.content.findProperty('id', actionTypeId));
-        return false;
-      }
-      /* User wants to know who actioned it
-      */
+  hidden: (function() {
+    return this.blank('content');
+  }).property('content.@each'),
 
-      if (actionTypeId = $target.data('who-acted')) {
-        this.get('controller').whoActed(this.content.findProperty('id', actionTypeId));
-        return false;
+  usersChanged: (function() {
+    return this.rerender();
+  }).observes('content.@each', 'content.users.@each'),
+
+  // This was creating way too many bound ifs and subviews in the handlebars version.
+  render: function(buffer) {
+    if (!this.present('content')) return;
+    return this.get('content').forEach(function(c) {
+      var alsoName;
+      buffer.push("
    ");
+
+      if (c.get('users')) {
+        c.get('users').forEach(function(u) {
+          buffer.push("");
+          buffer.push(Discourse.Utilities.avatarImg({
+            size: 'small',
+            username: u.get('username'),
+            avatarTemplate: u.get('avatar_template')
+          }));
+          return buffer.push("");
+        });
+        buffer.push(" " + (c.get('actionType.long_form')) + ".");
+      } else {
+        buffer.push("" + (c.get('description')) + ".");
       }
-      if (actionTypeId = $target.data('act')) {
-        this.content.findProperty('id', actionTypeId).act();
-        return false;
+
+      if (c.get('can_act')) {
+        alsoName = Em.String.i18n("post.actions.it_too", { alsoName: c.get('actionType.alsoName') });
+        buffer.push(" " + alsoName + ".");
       }
-      if (actionTypeId = $target.data('undo')) {
-        this.content.findProperty('id', actionTypeId).undo();
-        return false;
+
+      if (c.get('can_undo')) {
+        alsoName = Em.String.i18n("post.actions.undo", { alsoName: c.get('actionType.alsoNameLower') });
+        buffer.push(" " + alsoName + ".");
       }
+
+      if (c.get('can_clear_flags')) {
+        buffer.push(" " + (Em.String.i18n("post.actions.clear_flags", { count: c.count })) + ".");
+      }
+
+      buffer.push("
    ");
+    });
+  },
+
+  click: function(e) {
+    var $target, actionTypeId;
+    $target = $(e.target);
+
+    if (actionTypeId = $target.data('clear-flags')) {
+      this.get('controller').clearFlags(this.content.findProperty('id', actionTypeId));
       return false;
     }
-  });
 
-}).call(this);
+    // User wants to know who actioned it
+    if (actionTypeId = $target.data('who-acted')) {
+      this.get('controller').whoActed(this.content.findProperty('id', actionTypeId));
+      return false;
+    }
+
+    if (actionTypeId = $target.data('act')) {
+      this.content.findProperty('id', actionTypeId).act();
+      return false;
+    }
+
+    if (actionTypeId = $target.data('undo')) {
+      this.content.findProperty('id', actionTypeId).undo();
+      return false;
+    }
+
+    return false;
+  }
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/application_view.js b/app/assets/javascripts/discourse/views/application_view.js
index cb4317bf045..af98cb71892 100644
--- a/app/assets/javascripts/discourse/views/application_view.js
+++ b/app/assets/javascripts/discourse/views/application_view.js
@@ -1,7 +1,13 @@
-(function() {
+/**
+  This view handles rendering of the core application template
+
+  @class ApplicationView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+window.Discourse.ApplicationView = Discourse.View.extend({
+  templateName: 'application'
+});
 
-  window.Discourse.ApplicationView = Discourse.View.extend({
-    templateName: 'application'
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/archetype_options_modal_view.js b/app/assets/javascripts/discourse/views/archetype_options_modal_view.js
deleted file mode 100644
index 581141e8c2f..00000000000
--- a/app/assets/javascripts/discourse/views/archetype_options_modal_view.js
+++ /dev/null
@@ -1,8 +0,0 @@
-(function() {
-
-  window.Discourse.ArchetypeOptionsModalView = window.Discourse.ModalBodyView.extend({
-    templateName: 'modal/archetype_options',
-    title: Em.String.i18n('topic.options')
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/auto_sized_text_view.js b/app/assets/javascripts/discourse/views/auto_sized_text_view.js
deleted file mode 100644
index 5ea8e255c6e..00000000000
--- a/app/assets/javascripts/discourse/views/auto_sized_text_view.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function() {
-
-  Discourse.AutoSizedTextView = Discourse.View.extend({
-    render: function(buffer) {
-      return null;
-    },
-    didInsertElement: function(e) {
-      var fontSize, lh, lineHeight, me, _results;
-      me = this.$();
-      me.text(this.get('content'));
-      lh = lineHeight = parseInt(me.css("line-height"), 10);
-      fontSize = parseInt(me.css("font-size"), 10);
-      _results = [];
-      while (me.height() > lineHeight && fontSize > 12) {
-        fontSize -= 1;
-        lh -= 1;
-        me.css("font-size", "" + fontSize + "px");
-        _results.push(me.css("line-height", "" + lh + "px"));
-      }
-      return _results;
-    }
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/button_view.js b/app/assets/javascripts/discourse/views/button_view.js
index 6340b6ae576..1642af96186 100644
--- a/app/assets/javascripts/discourse/views/button_view.js
+++ b/app/assets/javascripts/discourse/views/button_view.js
@@ -1,21 +1,31 @@
-(function() {
+/**
+  This view handles rendering of a button
 
-  Discourse.ButtonView = Discourse.View.extend({
-    tagName: 'button',
-    classNameBindings: [':btn', ':standard', 'dropDownToggle'],
-    attributeBindings: ['data-not-implemented', 'title', 'data-toggle', 'data-share-url'],
-    title: (function() {
-      return Em.String.i18n(this.get('helpKey') || this.get('textKey'));
-    }).property('helpKey'),
-    text: (function() {
-      return Em.String.i18n(this.get('textKey'));
-    }).property('textKey'),
-    render: function(buffer) {
-      if (this.renderIcon) {
-        this.renderIcon(buffer);
-      }
-      return buffer.push(this.get('text'));
+  @class ButtonView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ButtonView = Discourse.View.extend({
+  tagName: 'button',
+  classNameBindings: [':btn', ':standard', 'dropDownToggle'],
+  attributeBindings: ['data-not-implemented', 'title', 'data-toggle', 'data-share-url'],
+
+  title: (function() {
+    return Em.String.i18n(this.get('helpKey') || this.get('textKey'));
+  }).property('helpKey'),
+
+  text: (function() {
+    return Em.String.i18n(this.get('textKey'));
+  }).property('textKey'),
+
+  render: function(buffer) {
+    if (this.renderIcon) {
+      this.renderIcon(buffer);
     }
-  });
+    return buffer.push(this.get('text'));
+  }
+
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/combobox_view.js b/app/assets/javascripts/discourse/views/combobox_view.js
index 8a22a81134f..55468b13a82 100644
--- a/app/assets/javascripts/discourse/views/combobox_view.js
+++ b/app/assets/javascripts/discourse/views/combobox_view.js
@@ -1,43 +1,52 @@
-(function() {
+/**
+  This view handles rendering of a combobox
 
-  Discourse.ComboboxView = Discourse.View.extend({
-    tagName: 'select',
-    classNames: ['combobox'],
-    valueAttribute: 'id',
-    render: function(buffer) {
-      var selected, _ref,
-        _this = this;
-      if (this.get('none')) {
-        buffer.push("");
-      }
-      selected = (_ref = this.get('value')) ? _ref.toString() : void 0;
-      if (this.get('content')) {
-        return this.get('content').each(function(o) {
-          var data, selectedText, val, _ref1;
-          val = (_ref1 = o[_this.get('valueAttribute')]) ? _ref1.toString() : void 0;
-          selectedText = val === selected ? "selected" : "";
-          data = "";
-          if (_this.dataAttributes) {
-            _this.dataAttributes.forEach(function(a) {
-              data += "data-" + a + "=\"" + (o.get(a)) + "\" ";
-            });
-          }
-          return buffer.push("");
-        });
-      }
-    },
-    didInsertElement: function() {
-      var $elem,
-        _this = this;
-      $elem = this.$();
-      $elem.chosen({
-        template: this.template,
-        disable_search_threshold: 5
-      });
-      return $elem.change(function(e) {
-        return _this.set('value', jQuery(e.target).val());
+  @class ComboboxView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ComboboxView = Discourse.View.extend({
+  tagName: 'select',
+  classNames: ['combobox'],
+  valueAttribute: 'id',
+
+  render: function(buffer) {
+    var selected, _ref,
+      _this = this;
+
+    // Add none option if required
+    if (this.get('none')) {
+      buffer.push("");
+    }
+
+    selected = (_ref = this.get('value')) ? _ref.toString() : void 0;
+    if (this.get('content')) {
+      return this.get('content').each(function(o) {
+        var data, selectedText, val, _ref1;
+        val = (_ref1 = o[_this.get('valueAttribute')]) ? _ref1.toString() : void 0;
+        selectedText = val === selected ? "selected" : "";
+        data = "";
+        if (_this.dataAttributes) {
+          _this.dataAttributes.forEach(function(a) {
+            data += "data-" + a + "=\"" + (o.get(a)) + "\" ";
+          });
+        }
+        return buffer.push("");
       });
     }
-  });
+  },
+
+  didInsertElement: function() {
+    var $elem,
+      _this = this;
+    $elem = this.$();
+    $elem.chosen({ template: this.template, disable_search_threshold: 5 });
+    $elem.change(function(e) {
+      _this.set('value', $(e.target).val());
+    });
+  }
+
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/combobox_view_category.js b/app/assets/javascripts/discourse/views/combobox_view_category.js
index cdc6a90e20e..ef97fa7a467 100644
--- a/app/assets/javascripts/discourse/views/combobox_view_category.js
+++ b/app/assets/javascripts/discourse/views/combobox_view_category.js
@@ -1,14 +1,20 @@
-(function() {
+/**
+  This view handles rendering of a combobox that can view a category
+
+  @class ComboboxViewCategory
+  @extends Discourse.ComboboxView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ComboboxViewCategory = Discourse.ComboboxView.extend({
+  none: 'category.none',
+  dataAttributes: ['color'],
+
+  template: function(text, templateData) {
+    if (!templateData.color) return text;
+    return "" + text + "";
+  }
+
+});
 
-  window.Discourse.ComboboxViewCategory = Discourse.ComboboxView.extend({
-    none: 'category.none',
-    dataAttributes: ['color'],
-    template: function(text, templateData) {
-      if (!templateData.color) {
-        return text;
-      }
-      return "" + text + "";
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/composer_view.js b/app/assets/javascripts/discourse/views/composer_view.js
index a5473c71745..9ac40a0d43c 100644
--- a/app/assets/javascripts/discourse/views/composer_view.js
+++ b/app/assets/javascripts/discourse/views/composer_view.js
@@ -1,387 +1,387 @@
 /*global Markdown:true assetPath:true */
-(function() {
 
-  window.Discourse.ComposerView = Discourse.View.extend({
-    templateName: 'composer',
-    elementId: 'reply-control',
-    classNameBindings: ['content.creatingPrivateMessage:private-message', 
-                        'composeState', 
-                        'content.loading', 
-                        'content.editTitle', 
-                        'postMade', 
-                        'content.creatingTopic:topic', 
-                        'content.showPreview', 
-                        'content.hidePreview'],
-                        
-    educationClosed: null,
-    composeState: (function() {
-      var state;
-      state = this.get('content.composeState');
-      if (!state) {
-        state = Discourse.Composer.CLOSED;
-      }
-      return state;
-    }).property('content.composeState'),
-    draftStatus: (function() {
-      return this.$('.saving-draft').text(this.get('content.draftStatus') || "");
-    }).observes('content.draftStatus'),
-    /* Disable fields when we're loading
-    */
+/**
+  This view handles rendering of the composer
 
-    loadingChanged: (function() {
-      if (this.get('loading')) {
-        return jQuery('#wmd-input, #reply-title').prop('disabled', 'disabled');
-      } else {
-        return jQuery('#wmd-input, #reply-title').prop('disabled', '');
-      }
-    }).observes('loading'),
-    postMade: (function() {
-      if (this.present('controller.createdPost')) {
-        return 'created-post';
-      }
-      return null;
-    }).property('content.createdPost'),
-    observeReplyChanges: (function() {
-      var _this = this;
-      if (this.get('content.hidePreview')) {
-        return;
-      }
-      return Ember.run.next(null, function() {
-        var $wmdPreview, caretPosition;
-        if (_this.editor) {
-          _this.editor.refreshPreview();
-          /* if the caret is on the last line ensure preview scrolled to bottom
-          */
+  @class ComposerView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ComposerView = Discourse.View.extend({
+  templateName: 'composer',
+  elementId: 'reply-control',
+  classNameBindings: ['content.creatingPrivateMessage:private-message',
+                      'composeState',
+                      'content.loading',
+                      'content.editTitle',
+                      'postMade',
+                      'content.creatingTopic:topic',
+                      'content.showPreview',
+                      'content.hidePreview'],
+  educationClosed: null,
 
-          caretPosition = Discourse.Utilities.caretPosition(_this.wmdInput[0]);
-          if (!_this.wmdInput.val().substring(caretPosition).match(/\n/)) {
-            $wmdPreview = jQuery('#wmd-preview:visible');
-            if ($wmdPreview.length > 0) {
-              return $wmdPreview.scrollTop($wmdPreview[0].scrollHeight);
-            }
+  composeState: (function() {
+    var state;
+    state = this.get('content.composeState');
+    if (!state) {
+      state = Discourse.Composer.CLOSED;
+    }
+    return state;
+  }).property('content.composeState'),
+
+  draftStatus: (function() {
+    return this.$('.saving-draft').text(this.get('content.draftStatus') || "");
+  }).observes('content.draftStatus'),
+
+  // Disable fields when we're loading
+  loadingChanged: (function() {
+    if (this.get('loading')) {
+      $('#wmd-input, #reply-title').prop('disabled', 'disabled');
+    } else {
+      $('#wmd-input, #reply-title').prop('disabled', '');
+    }
+  }).observes('loading'),
+
+  postMade: (function() {
+    if (this.present('controller.createdPost')) return 'created-post';
+    return null;
+  }).property('content.createdPost'),
+
+  observeReplyChanges: (function() {
+    var _this = this;
+    if (this.get('content.hidePreview')) return;
+    Ember.run.next(null, function() {
+      var $wmdPreview, caretPosition;
+      if (_this.editor) {
+        _this.editor.refreshPreview();
+        // if the caret is on the last line ensure preview scrolled to bottom
+        caretPosition = Discourse.Utilities.caretPosition(_this.wmdInput[0]);
+        if (!_this.wmdInput.val().substring(caretPosition).match(/\n/)) {
+          $wmdPreview = $('#wmd-preview:visible');
+          if ($wmdPreview.length > 0) {
+            return $wmdPreview.scrollTop($wmdPreview[0].scrollHeight);
           }
         }
-      });
-    }).observes('content.reply', 'content.hidePreview'),
-    closeEducation: function() {
+      }
+    });
+  }).observes('content.reply', 'content.hidePreview'),
+
+  closeEducation: function() {
+    this.set('educationClosed', true);
+    return false;
+  },
+
+  fetchNewUserEducation: (function() {
+    // If creating a topic, use topic_count, otherwise post_count
+    var count, educationKey,
+      _this = this;
+    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);
-      return false;
-    },
-    fetchNewUserEducation: (function() {
-      /* If creating a topic, use topic_count, otherwise post_count
-      */
+      this.set('educationContents', '');
+      return;
+    }
+    if (!this.get('controller.hasReply')) {
+      return;
+    }
+    this.set('educationClosed', false);
 
-      var count, educationKey,
-        _this = this;
-      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;
-      }
-      if (!this.get('controller.hasReply')) {
-        return;
-      }
-      this.set('educationClosed', false);
-      /* If visible update the text
-      */
+    // If visible update the text
+    educationKey = this.get('content.creatingTopic') ? 'new-topic' : 'new-reply';
+    return jQuery.get("/education/" + educationKey).then(function(result) {
+      return _this.set('educationContents', result);
+    });
+  }).observes('controller.hasReply', 'content.creatingTopic', 'Discourse.currentUser.reply_count'),
 
-      educationKey = this.get('content.creatingTopic') ? 'new-topic' : 'new-reply';
-      return jQuery.get("/education/" + educationKey).then(function(result) {
-        return _this.set('educationContents', result);
-      });
-    }).observes('controller.hasReply', 'content.creatingTopic', 'Discourse.currentUser.reply_count'),
-    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'),
-    newUserEducationVisibilityChanged: (function() {
-      var $panel;
-      $panel = jQuery('#new-user-education');
-      if (this.get('newUserEducationVisible')) {
-        return $panel.slideDown('fast');
-      } else {
-        return $panel.slideUp('fast');
-      }
-    }).observes('newUserEducationVisible'),
-    moveNewUserEducation: function(sizePx) {
-      return jQuery('#new-user-education').css('bottom', sizePx);
-    },
-    resize: (function() {
-      /* this still needs to wait on animations, need a clean way to do that
-      */
+  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'),
 
-      var _this = this;
-      return Em.run.next(null, function() {
-        var h, replyControl, sizePx;
-        replyControl = jQuery('#reply-control');
-        h = replyControl.height() || 0;
-        sizePx = "" + h + "px";
-        jQuery('.topic-area').css('padding-bottom', sizePx);
-        return jQuery('#new-user-education').css('bottom', sizePx);
-      });
-    }).observes('content.composeState'),
-    keyUp: function(e) {
-      var controller;
-      controller = this.get('controller');
-      controller.checkReplyLength();
-      if (e.which === 27) {
-        return controller.hitEsc();
-      }
-    },
-    didInsertElement: function() {
-      var replyControl;
-      replyControl = jQuery('#reply-control');
-      replyControl.DivResizer({
-        resize: this.resize,
-        onDrag: this.moveNewUserEducation
-      });
-      return Discourse.TransitionHelper.after(replyControl, this.resize);
-    },
-    click: function() {
-      return this.get('controller').click();
-    },
-    /* Called after the preview renders. Debounced for performance
-    */
+  newUserEducationVisibilityChanged: (function() {
+    var $panel;
+    $panel = $('#new-user-education');
+    if (this.get('newUserEducationVisible')) {
+      return $panel.slideDown('fast');
+    } else {
+      return $panel.slideUp('fast');
+    }
+  }).observes('newUserEducationVisible'),
 
-    afterRender: Discourse.debounce(function() {
-      var $wmdPreview, refresh,
-        _this = this;
-      $wmdPreview = jQuery('#wmd-preview');
-      if ($wmdPreview.length === 0) {
-        return;
-      }
-      Discourse.SyntaxHighlighting.apply($wmdPreview);
-      refresh = this.get('controller.content.post.id') !== void 0;
-      jQuery('a.onebox', $wmdPreview).each(function(i, e) {
-        return Discourse.Onebox.load(e, refresh);
-      });
-      return jQuery('span.mention', $wmdPreview).each(function(i, e) {
-        return Discourse.Mention.load(e, refresh);
-      });
-    }, 100),
-    cancelUpload: function() {
-      /* TODO
-      */
+  moveNewUserEducation: function(sizePx) {
+    $('#new-user-education').css('bottom', sizePx);
+  },
 
-    },
-    initEditor: function() {
-      /* not quite right, need a callback to pass in, meaning this gets called once,
-      */
+  resize: (function() {
+    // this still needs to wait on animations, need a clean way to do that
+    var _this = this;
+    return Em.run.next(null, function() {
+      var h, replyControl, sizePx;
+      replyControl = $('#reply-control');
+      h = replyControl.height() || 0;
+      sizePx = "" + h + "px";
+      $('.topic-area').css('padding-bottom', sizePx);
+      return $('#new-user-education').css('bottom', sizePx);
+    });
+  }).observes('content.composeState'),
 
-      /*    but if you start replying to another topic it will get the avatars wrong
-      */
+  keyUp: function(e) {
+    var controller;
+    controller = this.get('controller');
+    controller.checkReplyLength();
+    if (e.which === 27) controller.hitEsc();
+  },
 
-      var $uploadTarget, $wmdInput, editor, saveDraft, selected, template, topic, transformTemplate,
-        _this = this;
-      this.wmdInput = $wmdInput = jQuery('#wmd-input');
-      if ($wmdInput.length === 0 || $wmdInput.data('init') === true) {
-        return;
-      }
-      $LAB.script(assetPath('defer/html-sanitizer-bundle'));
-      Discourse.ComposerView.trigger("initWmdEditor");
-      template = Handlebars.compile("
    " +
-                                      "" +
-                                    "
    ");
-      transformTemplate = Handlebars.compile("{{avatar this imageSize=\"tiny\"}} {{this.username}}");
-      $wmdInput.data('init', true);
-      $wmdInput.autocomplete({
-        template: template,
-        dataSource: function(term, callback) {
-          return Discourse.UserSearch.search({
-            term: term,
-            callback: callback,
-            topicId: _this.get('controller.controllers.topic.content.id')
-          });
-        },
-        key: "@",
-        transformComplete: function(v) {
-          return v.username;
-        }
-      });
-      selected = [];
-      jQuery('#private-message-users').val(this.get('content.targetUsernames')).autocomplete({
-        template: template,
-        dataSource: function(term, callback) {
-          return Discourse.UserSearch.search({
-            term: term,
-            callback: callback,
-            exclude: selected.concat([Discourse.get('currentUser.username')])
-          });
-        },
-        onChangeItems: function(items) {
-          items = jQuery.map(items, function(i) {
-            if (i.username) {
-              return i.username;
-            } else {
-              return i;
-            }
-          });
-          _this.set('content.targetUsernames', items.join(","));
-          selected = items;
-        },
-        transformComplete: transformTemplate,
-        reverseTransform: function(i) {
-          return {
-            username: i
-          };
-        }
-      });
-      topic = this.get('topic');
-      this.editor = editor = new Markdown.Editor(Discourse.Utilities.markdownConverter({
-        lookupAvatar: function(username) {
-          return Discourse.Utilities.avatarImg({
-            username: username,
-            size: 'tiny'
-          });
-        },
-        sanitize: true
-      }));
-      $uploadTarget = jQuery('#reply-control');
-      this.editor.hooks.insertImageDialog = function(callback) {
-        callback(null);
-        _this.get('controller.controllers.modal').show(Discourse.ImageSelectorView.create({
-          composer: _this,
-          uploadTarget: $uploadTarget
-        }));
-        return true;
-      };
-      this.editor.hooks.onPreviewRefresh = function() {
-        return _this.afterRender();
-      };
-      this.editor.run();
-      this.set('editor', this.editor);
-      this.loadingChanged();
-      saveDraft = Discourse.debounce((function() {
-        return _this.get('controller').saveDraft();
-      }), 2000);
-      $wmdInput.keyup(function() {
-        saveDraft();
-        return true;
-      });
-      jQuery('#reply-title').keyup(function() {
-        saveDraft();
-        return true;
-      });
-      /* In case it's still bound somehow
-      */
+  didInsertElement: function() {
+    var replyControl;
+    replyControl = $('#reply-control');
+    replyControl.DivResizer({
+      resize: this.resize,
+      onDrag: this.moveNewUserEducation
+    });
+    Discourse.TransitionHelper.after(replyControl, this.resize);
+  },
 
-      $uploadTarget.fileupload('destroy');
-      /* Add the upload action
-      */
+  click: function() {
+    return this.get('controller').click();
+  },
 
-      $uploadTarget.fileupload({
-        url: '/uploads',
-        dataType: 'json',
-        timeout: 20000,
-        formData: {
-          topic_id: 1234
-        },
-        paste: function(e, data) {
-          if (data.files.length > 0) {
-            _this.set('loadingImage', true);
-            _this.set('uploadProgress', 0);
+  // Called after the preview renders. Debounced for performance
+  afterRender: Discourse.debounce(function() {
+    var $wmdPreview, refresh,
+      _this = this;
+    $wmdPreview = $('#wmd-preview');
+    if ($wmdPreview.length === 0) {
+      return;
+    }
+    Discourse.SyntaxHighlighting.apply($wmdPreview);
+    refresh = this.get('controller.content.post.id') !== void 0;
+    $('a.onebox', $wmdPreview).each(function(i, e) {
+      return Discourse.Onebox.load(e, refresh);
+    });
+    return $('span.mention', $wmdPreview).each(function(i, e) {
+      return Discourse.Mention.load(e, refresh);
+    });
+  }, 100),
+
+  cancelUpload: function() {
+    // TODO
+  },
+
+  initEditor: function() {
+    // not quite right, need a callback to pass in, meaning this gets called once,
+    // but if you start replying to another topic it will get the avatars wrong
+    var $uploadTarget, $wmdInput, editor, saveDraft, selected, template, topic, transformTemplate,
+      _this = this;
+    this.wmdInput = $wmdInput = $('#wmd-input');
+    if ($wmdInput.length === 0 || $wmdInput.data('init') === true) return;
+
+    $LAB.script(assetPath('defer/html-sanitizer-bundle'));
+    Discourse.ComposerView.trigger("initWmdEditor");
+    template = Handlebars.compile("
    " +
+                                    "" +
+                                  "
    ");
+
+    transformTemplate = Handlebars.compile("{{avatar this imageSize=\"tiny\"}} {{this.username}}");
+    $wmdInput.data('init', true);
+    $wmdInput.autocomplete({
+      template: template,
+      dataSource: function(term, callback) {
+        return Discourse.UserSearch.search({
+          term: term,
+          callback: callback,
+          topicId: _this.get('controller.controllers.topic.content.id')
+        });
+      },
+      key: "@",
+      transformComplete: function(v) { return v.username; }
+    });
+
+    selected = [];
+    $('#private-message-users').val(this.get('content.targetUsernames')).autocomplete({
+      template: template,
+
+      dataSource: function(term, callback) {
+        return Discourse.UserSearch.search({
+          term: term,
+          callback: callback,
+          exclude: selected.concat([Discourse.get('currentUser.username')])
+        });
+      },
+      onChangeItems: function(items) {
+        items = jQuery.map(items, function(i) {
+          if (i.username) {
+            return i.username;
+          } else {
+            return i;
           }
-          return true;
-        },
-        drop: function(e, data) {
-          if (e.originalEvent.dataTransfer.files.length === 1) {
-            _this.set('loadingImage', true);
-            return _this.set('uploadProgress', 0);
-          }
-        },
-        progressall: function(e, data) {
-          var progress;
-          progress = parseInt(data.loaded / data.total * 100, 10);
-          return _this.set('uploadProgress', progress);
-        },
-        done: function(e, data) {
-          var html, upload;
-          _this.set('loadingImage', false);
-          upload = data.result;
-          html = "";
-          return _this.addMarkdown(html);
-        },
-        fail: function(e, data) {
-          bootbox.alert(Em.String.i18n('post.errors.upload'));
-          return _this.set('loadingImage', false);
-        }
-      });
+        });
+        _this.set('content.targetUsernames', items.join(","));
+        selected = items;
+      },
 
-      // I hate to use Em.run.later, but I don't think there's a way of waiting for a CSS transition
-      // to finish.
-      return Em.run.later(jQuery, (function() {
-        var replyTitle;
-        replyTitle = jQuery('#reply-title');
-        _this.resize();
-        if (replyTitle.length) {
-          return replyTitle.putCursorAtEnd();
-        } else {
-          return $wmdInput.putCursorAtEnd();
-        }
-      }), 300);
-    },
-    addMarkdown: function(text) {
-      var caretPosition, ctrl, current,
-        _this = this;
-      ctrl = jQuery('#wmd-input').get(0);
-      caretPosition = Discourse.Utilities.caretPosition(ctrl);
-      current = this.get('content.reply');
-      this.set('content.reply', current.substring(0, caretPosition) + text + current.substring(caretPosition, current.length));
-      return Em.run.next(function() {
-        return Discourse.Utilities.setCaretPosition(ctrl, caretPosition + text.length);
-      });
-    },
-    /* Uses javascript to get the image sizes from the preview, if present
-    */
+      transformComplete: transformTemplate,
 
-    imageSizes: function() {
-      var result;
-      result = {};
-      jQuery('#wmd-preview img').each(function(i, e) {
-        var $img;
-        $img = jQuery(e);
-        result[$img.prop('src')] = {
-          width: $img.width(),
-          height: $img.height()
+      reverseTransform: function(i) {
+        return {
+          username: i
         };
-      });
-      return result;
-    },
-    childDidInsertElement: function(e) {
-      return this.initEditor();
-    }
-  });
+      }
 
-  // not sure if this is the right way, keeping here for now, we could use a mixin perhaps
-  Discourse.NotifyingTextArea = Ember.TextArea.extend({
-    placeholder: (function() {
-      return Em.String.i18n(this.get('placeholderKey'));
-    }).property('placeholderKey'),
-    didInsertElement: function() {
-      return this.get('parent').childDidInsertElement(this);
-    }
-  });
+    });
+
+    topic = this.get('topic');
+    this.editor = editor = new Markdown.Editor(Discourse.Utilities.markdownConverter({
+      lookupAvatar: function(username) {
+        return Discourse.Utilities.avatarImg({
+          username: username,
+          size: 'tiny'
+        });
+      },
+      sanitize: true
+    }));
+
+    $uploadTarget = $('#reply-control');
+    this.editor.hooks.insertImageDialog = function(callback) {
+      callback(null);
+      _this.get('controller.controllers.modal').show(Discourse.ImageSelectorView.create({
+        composer: _this,
+        uploadTarget: $uploadTarget
+      }));
+      return true;
+    };
+
+    this.editor.hooks.onPreviewRefresh = function() {
+      return _this.afterRender();
+    };
+
+    this.editor.run();
+    this.set('editor', this.editor);
+    this.loadingChanged();
+
+    saveDraft = Discourse.debounce((function() {
+      return _this.get('controller').saveDraft();
+    }), 2000);
+
+    $wmdInput.keyup(function() {
+      saveDraft();
+      return true;
+    });
+
+    $('#reply-title').keyup(function() {
+      saveDraft();
+      return true;
+    });
+
+    // In case it's still bound somehow
+    $uploadTarget.fileupload('destroy');
+
+    $uploadTarget.fileupload({
+      url: '/uploads',
+      dataType: 'json',
+      timeout: 20000,
+      formData: {
+        topic_id: 1234
+      },
+      paste: function(e, data) {
+        if (data.files.length > 0) {
+          _this.set('loadingImage', true);
+          _this.set('uploadProgress', 0);
+        }
+        return true;
+      },
+      drop: function(e, data) {
+        if (e.originalEvent.dataTransfer.files.length === 1) {
+          _this.set('loadingImage', true);
+          return _this.set('uploadProgress', 0);
+        }
+      },
+      progressall: function(e, data) {
+        var progress;
+        progress = parseInt(data.loaded / data.total * 100, 10);
+        return _this.set('uploadProgress', progress);
+      },
+      done: function(e, data) {
+        var html, upload;
+        _this.set('loadingImage', false);
+        upload = data.result;
+        html = "";
+        return _this.addMarkdown(html);
+      },
+      fail: function(e, data) {
+        bootbox.alert(Em.String.i18n('post.errors.upload'));
+        return _this.set('loadingImage', false);
+      }
+    });
+
+    // I hate to use Em.run.later, but I don't think there's a way of waiting for a CSS transition
+    // to finish.
+    return Em.run.later(jQuery, (function() {
+      var replyTitle;
+      replyTitle = $('#reply-title');
+      _this.resize();
+      if (replyTitle.length) {
+        return replyTitle.putCursorAtEnd();
+      } else {
+        return $wmdInput.putCursorAtEnd();
+      }
+    }), 300);
+  },
+
+  addMarkdown: function(text) {
+    var caretPosition, ctrl, current,
+      _this = this;
+    ctrl = $('#wmd-input').get(0);
+    caretPosition = Discourse.Utilities.caretPosition(ctrl);
+    current = this.get('content.reply');
+    this.set('content.reply', current.substring(0, caretPosition) + text + current.substring(caretPosition, current.length));
+    return Em.run.next(function() {
+      return Discourse.Utilities.setCaretPosition(ctrl, caretPosition + text.length);
+    });
+  },
+
+  // Uses javascript to get the image sizes from the preview, if present
+  imageSizes: function() {
+    var result;
+    result = {};
+    $('#wmd-preview img').each(function(i, e) {
+      var $img;
+      $img = $(e);
+      result[$img.prop('src')] = {
+        width: $img.width(),
+        height: $img.height()
+      };
+    });
+    return result;
+  },
+
+  childDidInsertElement: function(e) {
+    return this.initEditor();
+  }
+});
+
+// not sure if this is the right way, keeping here for now, we could use a mixin perhaps
+Discourse.NotifyingTextArea = Ember.TextArea.extend({
+  placeholder: (function() {
+    return Em.String.i18n(this.get('placeholderKey'));
+  }).property('placeholderKey'),
+  didInsertElement: function() {
+    return this.get('parent').childDidInsertElement(this);
+  }
+});
+
+RSVP.EventTarget.mixin(Discourse.ComposerView);
 
-  RSVP.EventTarget.mixin(Discourse.ComposerView);
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/discourse_text_field.js b/app/assets/javascripts/discourse/views/discourse_text_field.js
new file mode 100644
index 00000000000..b938b0c59b6
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/discourse_text_field.js
@@ -0,0 +1,18 @@
+/**
+  This is a custom text field that allows i18n placeholders
+
+  @class TextField
+  @extends Ember.TextField
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.TextField = Ember.TextField.extend({
+  attributeBindings: ['autocorrect', 'autocapitalize'],
+
+  placeholder: (function() {
+    return Em.String.i18n(this.get('placeholderKey'));
+  }).property('placeholderKey')
+
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/dropdown_button_view.js b/app/assets/javascripts/discourse/views/dropdown_button_view.js
index 65dd614b8e1..23ac61c18a7 100644
--- a/app/assets/javascripts/discourse/views/dropdown_button_view.js
+++ b/app/assets/javascripts/discourse/views/dropdown_button_view.js
@@ -1,47 +1,57 @@
-(function() {
+/**
+  This view handles rendering of a button in a drop down
 
-  Discourse.DropdownButtonView = Discourse.View.extend({
-    classNames: ['btn-group'],
-    attributeBindings: ['data-not-implemented'],
-    didInsertElement: function(e) {
-      var _this = this;
-      return this.$('ul li').on('click', function(e) {
-        e.preventDefault();
-        _this.clicked(jQuery(e.currentTarget).data('id'));
-        return false;
-      });
-    },
-    clicked: function(id) {
-      return null;
-    },
-    textChanged: (function() {
-      return this.rerender();
-    }).observes('text', 'longDescription'),
-    render: function(buffer) {
-      var desc;
-      buffer.push("
    " + (this.get('title')) + "
    ");
-      buffer.push("");
-      buffer.push("");
-      if (desc = this.get('longDescription')) {
-        buffer.push("
    ");
-        buffer.push(desc);
-        return buffer.push("
    ");
-      }
+  @class DropdownButtonView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.DropdownButtonView = Discourse.View.extend({
+  classNames: ['btn-group'],
+  attributeBindings: ['data-not-implemented'],
+
+  didInsertElement: function(e) {
+    var _this = this;
+    return this.$('ul li').on('click', function(e) {
+      e.preventDefault();
+      _this.clicked($(e.currentTarget).data('id'));
+      return false;
+    });
+  },
+
+  clicked: function(id) {
+    return null;
+  },
+
+  textChanged: (function() {
+    return this.rerender();
+  }).observes('text', 'longDescription'),
+
+  render: function(buffer) {
+    var desc;
+    buffer.push("
    " + (this.get('title')) + "
    ");
+    buffer.push("");
+    buffer.push("");
+    if (desc = this.get('longDescription')) {
+      buffer.push("
    ");
+      buffer.push(desc);
+      return buffer.push("
    ");
     }
-  });
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/embedded_post_view.js b/app/assets/javascripts/discourse/views/embedded_post_view.js
index 14b9a4347ee..c4e133626a4 100644
--- a/app/assets/javascripts/discourse/views/embedded_post_view.js
+++ b/app/assets/javascripts/discourse/views/embedded_post_view.js
@@ -1,13 +1,20 @@
-(function() {
+/**
+  This view handles rendering of post within another (such as a collapsed reply)
+
+  @class EmbeddedPostView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.EmbeddedPostView = Discourse.View.extend({
+  templateName: 'embedded_post',
+  classNames: ['reply'],
+
+  didInsertElement: function() {
+    var postView = this.get('postView') || this.get('parentView.postView');
+    return postView.get('screenTrack').track(this.get('elementId'), this.get('post.post_number'));
+  }
+
+});
 
-  window.Discourse.EmbeddedPostView = Discourse.View.extend({
-    templateName: 'embedded_post',
-    classNames: ['reply'],
-    didInsertElement: function() {
-      var postView;
-      postView = this.get('postView') || this.get('parentView.postView');
-      return postView.get('screenTrack').track(this.get('elementId'), this.get('post.post_number'));
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/excerpt/excerpt_category_view.js b/app/assets/javascripts/discourse/views/excerpt/excerpt_category_view.js
deleted file mode 100644
index dde4dc884b8..00000000000
--- a/app/assets/javascripts/discourse/views/excerpt/excerpt_category_view.js
+++ /dev/null
@@ -1,44 +0,0 @@
-(function() {
-
-  window.Discourse.ExcerptCategoryView = Discourse.View.extend({
-    editCategory: function() {
-      var cat, _ref;
-      this.get('parentView').close();
-      /* We create an attribute, id, with the old name so we can rename it.
-      */
-
-      cat = this.get('category');
-      cat.set('id', cat.get('slug'));
-      if (_ref = this.get('controller.controllers.modal')) {
-        _ref.showView(Discourse.EditCategoryView.create({
-          category: cat
-        }));
-      }
-      return false;
-    },
-    deleteCategory: function() {
-      var _this = this;
-      this.get('parentView').close();
-      bootbox.confirm(Em.String.i18n("category.delete_confirm"), function(result) {
-        if (result) {
-          return _this.get('category')["delete"](function() {
-            return Discourse.get('appController').reloadSession(function() {
-              return Discourse.get('router').route("/categories");
-            });
-          });
-        }
-      });
-      return false;
-    },
-    didInsertElement: function() {
-      return this.set('category', Discourse.Category.create({
-        name: this.get('name'),
-        color: this.get('color'),
-        slug: this.get('slug'),
-        excerpt: this.get('excerpt'),
-        topic_url: this.get('topic_url')
-      }));
-    }
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/excerpt/excerpt_post_view.js b/app/assets/javascripts/discourse/views/excerpt/excerpt_post_view.js
deleted file mode 100644
index b82473096f7..00000000000
--- a/app/assets/javascripts/discourse/views/excerpt/excerpt_post_view.js
+++ /dev/null
@@ -1,30 +0,0 @@
-(function() {
-
-  window.Discourse.ExcerptPostView = Discourse.View.extend({
-    mute: function() {
-      return this.update(true);
-    },
-    unmute: function() {
-      return this.update(false);
-    },
-    refreshLater: Discourse.debounce((function() {
-      return this.get('controller.controllers.listController').refresh();
-    }), 1000),
-    update: function(v) {
-      var _this = this;
-      this.set('muted', v);
-      return jQuery.post("/t/" + this.topic_id + "/" + (v ? "mute" : "unmute"), {
-        _method: 'put',
-        success: function() {
-          /* I experimented with this, but if feels like whackamole
-          */
-
-          /* @refreshLater()
-          */
-
-        }
-      });
-    }
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/excerpt/excerpt_user_view.js b/app/assets/javascripts/discourse/views/excerpt/excerpt_user_view.js
deleted file mode 100644
index 02a1a52c5e7..00000000000
--- a/app/assets/javascripts/discourse/views/excerpt/excerpt_user_view.js
+++ /dev/null
@@ -1,26 +0,0 @@
-(function() {
-
-  window.Discourse.ExcerptUserView = Discourse.View.extend({
-    privateMessage: function(e) {
-      var $target, composerController, post, postView, url, username;
-      $target = this.get("link");
-      postView = Discourse.View.views[$target.closest('.ember-view')[0].id];
-      post = postView.get("post");
-      url = post.get("url");
-      username = post.get("username");
-      Discourse.router.route('/users/' + Discourse.currentUser.username.toLowerCase() + "/private-messages");
-      /* TODO figure out a way for it to open the composer cleanly AFTER the navigation happens.
-      */
-
-      composerController = Discourse.get('router.composerController');
-      return composerController.open({
-        action: Discourse.Composer.PRIVATE_MESSAGE,
-        usernames: username,
-        archetypeId: 'private_message',
-        draftKey: 'new_private_message',
-        reply: window.location.href.split("/").splice(0, 3).join("/") + url
-      });
-    }
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/excerpt/excerpt_view.js b/app/assets/javascripts/discourse/views/excerpt/excerpt_view.js
deleted file mode 100644
index f48a8879ff5..00000000000
--- a/app/assets/javascripts/discourse/views/excerpt/excerpt_view.js
+++ /dev/null
@@ -1,185 +0,0 @@
-(function() {
-
-  window.Discourse.ExcerptView = Ember.ContainerView.extend({
-    classNames: ['excerpt-view'],
-    classNameBindings: ['position', 'size'],
-    childViews: ['closeView'],
-    closeView: Ember.View.create({
-      templateName: 'excerpt/close'
-    }),
-    /* Position the tooltip on the screen. There's probably a nicer way of coding this.
-    */
-
-    locationChanged: (function() {
-      var loc;
-      loc = this.get('location');
-      return this.$().css(loc);
-    }).observes('location'),
-    visibleChanged: (function() {
-      var _this = this;
-      if (this.get('disabled')) {
-        return;
-      }
-      if (this.get('visible')) {
-        if (!this.get('opening')) {
-          this.set('opening', true);
-          this.set('closing', false);
-          return jQuery('.excerpt-view').stop().fadeIn('fast', function() {
-            return _this.set('opening', false);
-          });
-        }
-      } else {
-        if (!this.get('closing')) {
-          this.set('closing', true);
-          this.set('opening', false);
-          return jQuery('.excerpt-view').stop().fadeOut('slow', function() {
-            return _this.set('closing', false);
-          });
-        }
-      }
-    }).observes('visible'),
-    urlChanged: (function() {
-      var _this = this;
-      if (this.get('url')) {
-        this.set('visible', false);
-        this.ajax = jQuery.ajax({
-          url: "/excerpt",
-          data: {
-            url: this.get('url')
-          },
-          success: function(tooltip) {
-            /* Make sure we still have a URL (if it changed, we no longer care about this request.)
-            */
-
-            var excerpt, instance, viewClass;
-            if (!_this.get('url')) {
-              return;
-            }
-            jQuery('.excerpt-view').stop().hide().css({
-              opacity: 1
-            });
-            _this.set('closing', false);
-            _this.set('location', _this.get('desiredLocation'));
-            if (tooltip.created_at) {
-              tooltip.created_at = Date.create(tooltip.created_at).relative();
-            }
-            viewClass = Discourse["Excerpt" + tooltip.type + "View"] || Em.View;
-            excerpt = Em.Object.create(tooltip);
-            excerpt.set('templateName', "excerpt/" + (tooltip.type.toLowerCase()));
-            if (_this.get('contentsView')) {
-              _this.removeObject(_this.get('contentsView'));
-            }
-            instance = viewClass.create(excerpt);
-            instance.set("link", _this.hovering);
-            _this.set('contentsView', instance);
-            _this.addObject(instance);
-            _this.set('excerpt', tooltip);
-            return _this.set('visible', true);
-          },
-          error: function() {
-            return _this.close();
-          },
-          complete: this.ajax = null
-        });
-      }
-    }).observes('url'),
-    close: function() {
-      Em.run.cancel(this.closeTimer);
-      Em.run.cancel(this.openTimer);
-      this.set('url', null);
-      this.set('visible', false);
-      return false;
-    },
-    closeSoon: function() {
-      var _this = this;
-      this.closeTimer = Em.run.later(function() {
-        return _this.close();
-      }, 200);
-    },
-    disable: function() {
-      this.set('disabled', true);
-      Em.run.cancel(this.openTimer);
-      Em.run.cancel(this.closeTimer);
-      this.set('visible', false);
-      if (this.ajax && this.ajax.abort) {
-        this.ajax.abort();
-      }
-      return jQuery('.excerpt-view').stop().hide();
-    },
-    enable: function() {
-      return this.set('disabled', false);
-    }
-
-    /* lets disable this puppy for now, it looks unprofessional    
-    didInsertElement: function() {
-
-      var _this = this;
-      // We don't do hovering on touch devices
-      if (Discourse.get('touch')) {
-        return;
-      }
-      // If they dash into the excerpt, keep it open until they leave
-
-      jQuery('.excerpt-view').on('mouseover', function(e) {
-        return Em.run.cancel(_this.closeTimer);
-      });
-      jQuery('.excerpt-view').on('mouseleave', function(e) {
-        return _this.closeSoon();
-      });
-      jQuery('#main').on('mouseover', '.excerptable', function(e) {
-        var $target;
-        $target = jQuery(e.currentTarget);
-        _this.hovering = $target;
-        // Make sure they're holding in place before we pop it up to mimimize annoyance
-        Em.run.cancel(_this.openTimer);
-        Em.run.cancel(_this.closeTimer);
-        _this.openTimer = Em.run.later(function() {
-          var bottomPosY, height, margin, pos, positionText, topPosY;
-          pos = $target.offset();
-          pos.top = pos.top - jQuery(window).scrollTop();
-          positionText = $target.data('excerpt-position') || 'top';
-          margin = 25;
-          height = _this.$().height();
-          topPosY = (pos.top - height) - margin;
-          bottomPosY = pos.top + margin;
-          // Switch to right if there's no room on top
-
-          if (positionText === 'top') {
-            if (topPosY < 10) {
-              positionText = 'bottom';
-            }
-          }
-          switch (positionText) {
-            case 'right':
-              pos.left = pos.left + $target.width() + margin;
-              pos.top = pos.top - $target.height();
-              break;
-            case 'left':
-              pos.left = pos.left - _this.$().width() - margin;
-              pos.top = pos.top - $target.height();
-              break;
-            case 'top':
-              pos.top = topPosY;
-              break;
-            case 'bottom':
-              pos.top = bottomPosY;
-          }
-          if ((pos.left || 0) <= 0 && (pos.top || 0) <= 0) {
-            // somehow, sometimes, we are trying to position stuff in weird spots, just skip it
-            return;
-          }
-          _this.set('position', positionText);
-          _this.set('desiredLocation', pos);
-          _this.set('size', $target.data('excerpt-size'));
-          return _this.set('url', $target.prop('href'));
-        }, _this.get('visible') || _this.get('closing') ? 100 : Discourse.SiteSettings.popup_delay);
-      });
-      return jQuery('#main').on('mouseleave', '.excerptable', function(e) {
-        Em.run.cancel(_this.openTimer);
-        return _this.closeSoon();
-      });      
-    }
-    */      
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/featured_threads_view.js b/app/assets/javascripts/discourse/views/featured_threads_view.js
deleted file mode 100644
index 94eaeeba468..00000000000
--- a/app/assets/javascripts/discourse/views/featured_threads_view.js
+++ /dev/null
@@ -1,12 +0,0 @@
-(function() {
-
-  window.Discourse.FeaturedTopicsView = Discourse.View.extend({
-    templateName: 'featured_topics',
-    classNames: ['category-list-item'],
-    init: function() {
-      this._super();
-      return this.set('context', this.get('content'));
-    }
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/featured_topics_view.js b/app/assets/javascripts/discourse/views/featured_topics_view.js
index 2f845ca58b8..6f4fa644ec1 100644
--- a/app/assets/javascripts/discourse/views/featured_topics_view.js
+++ b/app/assets/javascripts/discourse/views/featured_topics_view.js
@@ -1,8 +1,14 @@
-(function() {
+/**
+  This view handles rendering of featured topics at the bottom of a topic
+
+  @class FeaturedTopicsView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+window.Discourse.FeaturedTopicsView = Discourse.View.extend({
+  templateName: 'featured_topics',
+  classNames: ['category-list-item']
+});
 
-  window.Discourse.FeaturedTopicsView = Discourse.View.extend({
-    templateName: 'featured_topics',
-    classNames: ['category-list-item']
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/flag_view.js b/app/assets/javascripts/discourse/views/flag_view.js
deleted file mode 100644
index de7be465f11..00000000000
--- a/app/assets/javascripts/discourse/views/flag_view.js
+++ /dev/null
@@ -1,83 +0,0 @@
-(function() {
-
-  window.Discourse.FlagView = Discourse.ModalBodyView.extend({
-    templateName: 'flag',
-    title: Em.String.i18n('flagging.title'),
-    changePostActionType: function(action) {
-      if (this.get('postActionTypeId') === action.id) {
-        return false;
-      }
-      this.set('postActionTypeId', action.id);
-      this.set('isCustomFlag', action.is_custom_flag);
-      Em.run.next(function() {
-        return jQuery("#radio_" + action.name_key).prop('checked', 'true');
-      });
-      return false;
-    },
-    createFlag: function() {
-      var actionType, _ref,
-        _this = this;
-      actionType = Discourse.get("site").postActionTypeById(this.get('postActionTypeId'));
-      if (_ref = this.get("post.actionByName." + (actionType.get('name_key')))) {
-        _ref.act({
-          message: this.get('customFlagMessage')
-        }).then(function() {
-          return jQuery('#discourse-modal').modal('hide');
-        }, function(errors) {
-          return _this.displayErrors(errors);
-        });
-      }
-      return false;
-    },
-    customPlaceholder: (function() {
-      return Em.String.i18n("flagging.custom_placeholder");
-    }).property(),
-    showSubmit: (function() {
-      var m;
-      if (this.get("postActionTypeId")) {
-        if (this.get("isCustomFlag")) {
-          m = this.get("customFlagMessage");
-          return m && m.length >= 10 && m.length <= 500;
-        } else {
-          return true;
-        }
-      }
-      return false;
-    }).property("isCustomFlag", "customFlagMessage", "postActionTypeId"),
-    customFlagMessageChanged: (function() {
-      var len, message, minLen, _ref;
-      minLen = 10;
-      len = ((_ref = this.get('customFlagMessage')) ? _ref.length : void 0) || 0;
-      this.set("customMessageLengthClasses", "too-short custom-message-length");
-      if (len === 0) {
-        message = Em.String.i18n("flagging.custom_message.at_least", {
-          n: minLen
-        });
-      } else if (len < minLen) {
-        message = Em.String.i18n("flagging.custom_message.more", {
-          n: minLen - len
-        });
-      } else {
-        message = Em.String.i18n("flagging.custom_message.left", {
-          n: 500 - len
-        });
-        this.set("customMessageLengthClasses", "ok custom-message-length");
-      }
-      this.set("customMessageLength", message);
-    }).observes("customFlagMessage"),
-    didInsertElement: function() {
-      var $flagModal;
-      this.customFlagMessageChanged();
-      this.set('postActionTypeId', null);
-      $flagModal = jQuery('#flag-modal');
-      /* Would be nice if there were an EmberJs radio button to do this for us. Oh well, one should be coming
-      */
-
-      /* in an upcoming release.
-      */
-
-      jQuery("input[type='radio']", $flagModal).prop('checked', false);
-    }
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/header_view.js b/app/assets/javascripts/discourse/views/header_view.js
index ffccd95b546..5ef8cc14285 100644
--- a/app/assets/javascripts/discourse/views/header_view.js
+++ b/app/assets/javascripts/discourse/views/header_view.js
@@ -1,119 +1,124 @@
-(function() {
+/**
+  This view handles rendering of the header of the site
 
-  window.Discourse.HeaderView = Discourse.View.extend({
-    tagName: 'header',
-    classNames: ['d-header', 'clearfix'],
-    classNameBindings: ['editingTopic'],
-    templateName: 'header',
-    siteBinding: 'Discourse.site',
-    currentUserBinding: 'Discourse.currentUser',
-    categoriesBinding: 'site.categories',
-    topicBinding: 'Discourse.router.topicController.content',
-    showDropdown: function($target) {
-      var $dropdown, $html, $li, $ul, elementId, hideDropdown,
-        _this = this;
-      elementId = $target.data('dropdown') || $target.data('notifications');
-      $dropdown = jQuery("#" + elementId);
-      $li = $target.closest('li');
-      $ul = $target.closest('ul');
-      $li.addClass('active');
-      jQuery('li', $ul).not($li).removeClass('active');
-      jQuery('.d-dropdown').not($dropdown).fadeOut('fast');
-      $dropdown.fadeIn('fast');
-      $dropdown.find('input[type=text]').focus().select();
-      $html = jQuery('html');
-      hideDropdown = function() {
-        $dropdown.fadeOut('fast');
-        $li.removeClass('active');
-        $html.data('hide-dropdown', null);
-        return $html.off('click.d-dropdown');
-      };
-      $html.on('click.d-dropdown', function(e) {
-        if (jQuery(e.target).closest('.d-dropdown').length > 0) {
-          return true;
-        }
-        return hideDropdown();
-      });
-      $html.data('hide-dropdown', hideDropdown);
-      return false;
-    },
-    showNotifications: function() {
-      var _this = this;
-      jQuery.get("/notifications").then(function(result) {
-        _this.set('notifications', result.map(function(n) {
-          return Discourse.Notification.create(n);
-        }));
-        /* We've seen all the notifications now
-        */
+  @class HeaderView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.HeaderView = Discourse.View.extend({
+  tagName: 'header',
+  classNames: ['d-header', 'clearfix'],
+  classNameBindings: ['editingTopic'],
+  templateName: 'header',
+  siteBinding: 'Discourse.site',
+  currentUserBinding: 'Discourse.currentUser',
+  categoriesBinding: 'site.categories',
+  topicBinding: 'Discourse.router.topicController.content',
 
-        _this.set('currentUser.unread_notifications', 0);
-        _this.set('currentUser.unread_private_messages', 0);
-        return _this.showDropdown(jQuery('#user-notifications'));
-      });
-      return false;
-    },
-    examineDockHeader: function() {
-      var $body, offset, outlet;
-      if (!this.docAt) {
-        outlet = jQuery('#main-outlet');
-        if (!(outlet && outlet.length === 1)) {
-          return;
-        }
-        this.docAt = outlet.offset().top;
+  showDropdown: function($target) {
+    var $dropdown, $html, $li, $ul, elementId, hideDropdown,
+      _this = this;
+    elementId = $target.data('dropdown') || $target.data('notifications');
+    $dropdown = $("#" + elementId);
+    $li = $target.closest('li');
+    $ul = $target.closest('ul');
+    $li.addClass('active');
+    $('li', $ul).not($li).removeClass('active');
+    $('.d-dropdown').not($dropdown).fadeOut('fast');
+    $dropdown.fadeIn('fast');
+    $dropdown.find('input[type=text]').focus().select();
+    $html = $('html');
+    hideDropdown = function() {
+      $dropdown.fadeOut('fast');
+      $li.removeClass('active');
+      $html.data('hide-dropdown', null);
+      return $html.off('click.d-dropdown');
+    };
+    $html.on('click.d-dropdown', function(e) {
+      if ($(e.target).closest('.d-dropdown').length > 0) {
+        return true;
       }
-      offset = window.pageYOffset || jQuery('html').scrollTop();
-      if (offset >= this.docAt) {
-        if (!this.dockedHeader) {
-          $body = jQuery('body');
-          $body.addClass('docked');
-          this.dockedHeader = true;
-        }
-      } else {
-        if (this.dockedHeader) {
-          jQuery('body').removeClass('docked');
-          this.dockedHeader = false;
-        }
-      }
-    },
-    willDestroyElement: function() {
-      jQuery(window).unbind('scroll.discourse-dock');
-      return jQuery(document).unbind('touchmove.discourse-dock');
-    },
-    didInsertElement: function() {
-      var _this = this;
-      this.$('a[data-dropdown]').on('click', function(e) {
-        return _this.showDropdown(jQuery(e.currentTarget));
-      });
-      this.$('a.unread-private-messages, a.unread-notifications, a[data-notifications]').on('click', function(e) {
-        return _this.showNotifications(e);
-      });
-      jQuery(window).bind('scroll.discourse-dock', function() {
-        return _this.examineDockHeader();
-      });
-      jQuery(document).bind('touchmove.discourse-dock', function() {
-        return _this.examineDockHeader();
-      });
-      this.examineDockHeader();
-      /* Delegate ESC to the composer
-      */
+      return hideDropdown();
+    });
+    $html.data('hide-dropdown', hideDropdown);
+    return false;
+  },
 
-      return jQuery('body').on('keydown.header', function(e) {
-        /* Hide dropdowns
-        */
-        if (e.which === 27) {
-          _this.$('li').removeClass('active');
-          _this.$('.d-dropdown').fadeOut('fast');
-        }
-        if (_this.get('editingTopic')) {
-          if (e.which === 13) {
-            _this.finishedEdit();
-          }
-          if (e.which === 27) {
-            return _this.cancelEdit();
-          }
-        }
-      });
+  showNotifications: function() {
+    var _this = this;
+    jQuery.get("/notifications").then(function(result) {
+      _this.set('notifications', result.map(function(n) {
+        return Discourse.Notification.create(n);
+      }));
+      // We've seen all the notifications now
+      _this.set('currentUser.unread_notifications', 0);
+      _this.set('currentUser.unread_private_messages', 0);
+      return _this.showDropdown($('#user-notifications'));
+    });
+    return false;
+  },
+
+  examineDockHeader: function() {
+    var $body, offset, outlet;
+    if (!this.docAt) {
+      outlet = $('#main-outlet');
+      if (!(outlet && outlet.length === 1)) return;
+      this.docAt = outlet.offset().top;
     }
-  });
+    offset = window.pageYOffset || $('html').scrollTop();
+    if (offset >= this.docAt) {
+      if (!this.dockedHeader) {
+        $body = $('body');
+        $body.addClass('docked');
+        this.dockedHeader = true;
+      }
+    } else {
+      if (this.dockedHeader) {
+        $('body').removeClass('docked');
+        this.dockedHeader = false;
+      }
+    }
+  },
+
+  willDestroyElement: function() {
+    $(window).unbind('scroll.discourse-dock');
+    return $(document).unbind('touchmove.discourse-dock');
+  },
+
+  didInsertElement: function() {
+    var _this = this;
+    this.$('a[data-dropdown]').on('click', function(e) {
+      return _this.showDropdown($(e.currentTarget));
+    });
+    this.$('a.unread-private-messages, a.unread-notifications, a[data-notifications]').on('click', function(e) {
+      return _this.showNotifications(e);
+    });
+    $(window).bind('scroll.discourse-dock', function() {
+      return _this.examineDockHeader();
+    });
+    $(document).bind('touchmove.discourse-dock', function() {
+      return _this.examineDockHeader();
+    });
+    this.examineDockHeader();
+
+    // Delegate ESC to the composer
+    return $('body').on('keydown.header', function(e) {
+      // Hide dropdowns
+      if (e.which === 27) {
+        _this.$('li').removeClass('active');
+        _this.$('.d-dropdown').fadeOut('fast');
+      }
+      if (_this.get('editingTopic')) {
+        if (e.which === 13) {
+          _this.finishedEdit();
+        }
+        if (e.which === 27) {
+          return _this.cancelEdit();
+        }
+      }
+    });
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/history_view.js b/app/assets/javascripts/discourse/views/history_view.js
deleted file mode 100644
index ac8d4a73195..00000000000
--- a/app/assets/javascripts/discourse/views/history_view.js
+++ /dev/null
@@ -1,42 +0,0 @@
-(function() {
-
-  window.Discourse.HistoryView = Discourse.View.extend({
-    templateName: 'history',
-    title: 'History',
-    modalClass: 'history-modal',
-    loadSide: function(side) {
-      var orig, version,
-        _this = this;
-      if (this.get("version" + side)) {
-        orig = this.get('originalPost');
-        version = this.get("version" + side + ".number");
-        if (version === orig.get('version')) {
-          return this.set("post" + side, orig);
-        } else {
-          return Discourse.Post.loadVersion(orig.get('id'), version, function(post) {
-            return _this.set("post" + side, post);
-          });
-        }
-      }
-    },
-    changedLeftVersion: (function() {
-      return this.loadSide("Left");
-    }).observes('versionLeft'),
-    changedRightVersion: (function() {
-      return this.loadSide("Right");
-    }).observes('versionRight'),
-    didInsertElement: function() {
-      var _this = this;
-      this.set('loading', true);
-      this.set('postLeft', null);
-      this.set('postRight', null);
-      return this.get('originalPost').loadVersions(function(result) {
-        _this.set('loading', false);
-        _this.set('versionLeft', result.first());
-        _this.set('versionRight', result.last());
-        return _this.set('versions', result);
-      });
-    }
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/image_selector.js b/app/assets/javascripts/discourse/views/image_selector.js
deleted file mode 100644
index 0a2f31cfd7e..00000000000
--- a/app/assets/javascripts/discourse/views/image_selector.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(function() {
-
-  window.Discourse.ImageSelectorView = Discourse.View.extend({
-    templateName: 'image_selector',
-    classNames: ['image-selector'],
-    title: 'Insert Image',
-    init: function() {
-      this._super();
-      return this.set('localSelected', true);
-    },
-    selectLocal: function() {
-      return this.set('localSelected', true);
-    },
-    selectRemote: function() {
-      return this.set('localSelected', false);
-    },
-    remoteSelected: (function() {
-      return !this.get('localSelected');
-    }).property('localSelected'),
-    upload: function() {
-      this.get('uploadTarget').fileupload('send', {
-        fileInput: jQuery('#filename-input')
-      });
-      return jQuery('#discourse-modal').modal('hide');
-    },
-    add: function() {
-      this.get('composer').addMarkdown("![image](" + (jQuery('#fileurl-input').val()) + ")");
-      return jQuery('#discourse-modal').modal('hide');
-    }
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/input_tip_view.js b/app/assets/javascripts/discourse/views/input_tip_view.js
index 32a01905df8..22337922e96 100644
--- a/app/assets/javascripts/discourse/views/input_tip_view.js
+++ b/app/assets/javascripts/discourse/views/input_tip_view.js
@@ -1,24 +1,34 @@
-(function() {
+/**
+  This view handles rendering a tip when a field on a form is invalid
 
-  Discourse.InputTipView = Discourse.View.extend({
-    templateName: 'input_tip',
-    classNameBindings: [':tip', 'good', 'bad'],
-    good: (function() {
-      return !this.get('validation.failed');
-    }).property('validation'),
-    bad: (function() {
-      return this.get('validation.failed');
-    }).property('validation'),
-    triggerRender: (function() {
-      return this.rerender();
-    }).observes('validation'),
-    render: function(buffer) {
-      var icon, reason;
-      if (reason = this.get('validation.reason')) {
-        icon = this.get('good') ? 'icon-ok' : 'icon-remove';
-        return buffer.push(" " + reason);
-      }
+  @class InputTipView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.InputTipView = Discourse.View.extend({
+  templateName: 'input_tip',
+  classNameBindings: [':tip', 'good', 'bad'],
+
+  good: (function() {
+    return !this.get('validation.failed');
+  }).property('validation'),
+
+  bad: (function() {
+    return this.get('validation.failed');
+  }).property('validation'),
+
+  triggerRender: (function() {
+    return this.rerender();
+  }).observes('validation'),
+
+  render: function(buffer) {
+    var icon, reason;
+    if (reason = this.get('validation.reason')) {
+      icon = this.get('good') ? 'icon-ok' : 'icon-remove';
+      return buffer.push(" " + reason);
     }
-  });
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/list/list_categories_view.js b/app/assets/javascripts/discourse/views/list/list_categories_view.js
index 92ec774b619..e1ccd02d9bb 100644
--- a/app/assets/javascripts/discourse/views/list/list_categories_view.js
+++ b/app/assets/javascripts/discourse/views/list/list_categories_view.js
@@ -1,10 +1,19 @@
-(function() {
+/**
+  This view handles the rendering of a category list
+
+  @class ListCategoriesView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+window.Discourse.ListCategoriesView = Discourse.View.extend({
+
+  templateName: 'list/categories',
+
+  didInsertElement: function() {
+    return Discourse.set('title', Em.String.i18n("category.list"));
+  }
+
+});
 
-  window.Discourse.ListCategoriesView = Discourse.View.extend({
-    templateName: 'list/categories',
-    didInsertElement: function() {
-      return Discourse.set('title', Em.String.i18n("category.list"));
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/list/list_topics_view.js b/app/assets/javascripts/discourse/views/list/list_topics_view.js
index 280f09420e6..c445e155fed 100644
--- a/app/assets/javascripts/discourse/views/list/list_topics_view.js
+++ b/app/assets/javascripts/discourse/views/list/list_topics_view.js
@@ -1,97 +1,110 @@
-(function() {
+/**
+  This view handles the rendering of a topic list
 
-  window.Discourse.ListTopicsView = Discourse.View.extend(Discourse.Scrolling, {
-    templateName: 'list/topics',
-    categoryBinding: 'Discourse.router.listController.category',
-    filterModeBinding: 'Discourse.router.listController.filterMode',
-    canCreateTopicBinding: 'controller.controllers.list.canCreateTopic',
-    insertedCount: (function() {
-      var inserted;
-      inserted = this.get('controller.inserted');
-      if (!inserted) {
-        return 0;
-      }
-      return inserted.length;
-    }).property('controller.inserted.@each'),
-    rollUp: (function() {
-      return this.get('insertedCount') > Discourse.SiteSettings.new_topics_rollup;
-    }).property('insertedCount'),
-    loadedMore: false,
-    currentTopicId: null,
-    willDestroyElement: function() {
-      return this.unbindScrolling();
-    },
-    allLoaded: (function() {
-      return !this.get('loading') && !this.get('controller.content.more_topics_url');
-    }).property('loading', 'controller.content.more_topics_url'),
-    didInsertElement: function() {
-      var eyeline, scrollPos,
-        _this = this;
-      this.bindScrolling();
-      eyeline = new Discourse.Eyeline('.topic-list-item');
-      eyeline.on('sawBottom', function() {
-        return _this.loadMore();
+  @class ListTopicsView
+  @extends Discourse.View
+  @namespace Discourse
+  @uses Discourse.Scrolling
+  @module Discourse
+**/
+Discourse.ListTopicsView = Discourse.View.extend(Discourse.Scrolling, {
+  templateName: 'list/topics',
+  categoryBinding: 'Discourse.router.listController.category',
+  filterModeBinding: 'Discourse.router.listController.filterMode',
+  canCreateTopicBinding: 'controller.controllers.list.canCreateTopic',
+  loadedMore: false,
+  currentTopicId: null,
+
+  insertedCount: (function() {
+    var inserted;
+    inserted = this.get('controller.inserted');
+    if (!inserted) {
+      return 0;
+    }
+    return inserted.length;
+  }).property('controller.inserted.@each'),
+
+  rollUp: (function() {
+    return this.get('insertedCount') > Discourse.SiteSettings.new_topics_rollup;
+  }).property('insertedCount'),
+
+  willDestroyElement: function() {
+    this.unbindScrolling();
+  },
+
+  allLoaded: (function() {
+    return !this.get('loading') && !this.get('controller.content.more_topics_url');
+  }).property('loading', 'controller.content.more_topics_url'),
+
+  didInsertElement: function() {
+    var eyeline, scrollPos,
+      _this = this;
+    this.bindScrolling();
+    eyeline = new Discourse.Eyeline('.topic-list-item');
+    eyeline.on('sawBottom', function() {
+      return _this.loadMore();
+    });
+    if (scrollPos = Discourse.get('transient.topicListScrollPos')) {
+      Em.run.next(function() {
+        return $('html, body').scrollTop(scrollPos);
       });
-      if (scrollPos = Discourse.get('transient.topicListScrollPos')) {
-        Em.run.next(function() {
-          return jQuery('html, body').scrollTop(scrollPos);
-        });
-      } else {
-        Em.run.next(function() {
-          return jQuery('html, body').scrollTop(0);
-        });
-      }
-      this.set('eyeline', eyeline);
-      return this.set('currentTopicId', null);
-    },
-    loadMore: function() {
-      var _this = this;
-      if (this.get('loading')) {
-        return;
-      }
-      this.set('loading', true);
-      return this.get('controller.content').loadMoreTopics().then(function(hasMoreResults) {
-        _this.set('loadedMore', true);
-        _this.set('loading', false);
-        Em.run.next(function() {
-          return _this.saveScrollPos();
-        });
-        if (!hasMoreResults) {
-          return _this.get('eyeline').flushRest();
-        }
+    } else {
+      Em.run.next(function() {
+        return $('html, body').scrollTop(0);
       });
-    },
-    /* Remember where we were scrolled to
-    */
+    }
+    this.set('eyeline', eyeline);
+    return this.set('currentTopicId', null);
+  },
 
-    saveScrollPos: function() {
-      return Discourse.set('transient.topicListScrollPos', jQuery(window).scrollTop());
-    },
-    /* When the topic list is scrolled
-    */
-
-    scrolled: function(e) {
-      var _ref;
-      this.saveScrollPos();
-      return (_ref = this.get('eyeline')) ? _ref.update() : void 0;
-    },
-    footerMessage: (function() {
-      var content, split;
-      if (!this.get('allLoaded')) {
-        return;
+  loadMore: function() {
+    var _this = this;
+    if (this.get('loading')) {
+      return;
+    }
+    this.set('loading', true);
+    return this.get('controller.content').loadMoreTopics().then(function(hasMoreResults) {
+      _this.set('loadedMore', true);
+      _this.set('loading', false);
+      Em.run.next(function() {
+        return _this.saveScrollPos();
+      });
+      if (!hasMoreResults) {
+        return _this.get('eyeline').flushRest();
       }
-      content = this.get('controller.content');
-      split = content.get('filter').split('/');
-      if (content.get('topics.length') === 0) {
-        return Em.String.i18n("topics.none." + split[0], {
-          category: split[1]
-        });
-      } else {
-        return Em.String.i18n("topics.bottom." + split[0], {
-          category: split[1]
-        });
-      }
-    }).property('allLoaded', 'controller.content.topics.length')
-  });
+    });
+  },
+
+  // Remember where we were scrolled to
+  saveScrollPos: function() {
+    return Discourse.set('transient.topicListScrollPos', $(window).scrollTop());
+  },
+
+  // When the topic list is scrolled
+  scrolled: function(e) {
+    var _ref;
+    this.saveScrollPos();
+    return (_ref = this.get('eyeline')) ? _ref.update() : void 0;
+  },
+
+  footerMessage: (function() {
+    var content, split;
+    if (!this.get('allLoaded')) {
+      return;
+    }
+    content = this.get('controller.content');
+    split = content.get('filter').split('/');
+    if (content.get('topics.length') === 0) {
+      return Em.String.i18n("topics.none." + split[0], {
+        category: split[1]
+      });
+    } else {
+      return Em.String.i18n("topics.bottom." + split[0], {
+        category: split[1]
+      });
+    }
+  }).property('allLoaded', 'controller.content.topics.length')
+
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/list/list_view.js b/app/assets/javascripts/discourse/views/list/list_view.js
index 68c0deb8e06..d9789ceb8ee 100644
--- a/app/assets/javascripts/discourse/views/list/list_view.js
+++ b/app/assets/javascripts/discourse/views/list/list_view.js
@@ -1,26 +1,33 @@
-(function() {
+/**
+  This view handles the rendering of a list
 
-  window.Discourse.ListView = Discourse.View.extend({
-    templateName: 'list/list',
-    composeViewBinding: Ember.Binding.oneWay('Discourse.composeView'),
-    categoriesBinding: 'Discourse.site.categories',
-    /* The window has been scrolled
-    */
+  @class ListView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ListView = Discourse.View.extend({
+  templateName: 'list/list',
+  composeViewBinding: Ember.Binding.oneWay('Discourse.composeView'),
+  categoriesBinding: 'Discourse.site.categories',
+
+  // The window has been scrolled
+  scrolled: function(e) {
+    var currentView;
+    currentView = this.get('container.currentView');
+    return currentView ? typeof currentView.scrolled === "function" ? currentView.scrolled(e) : void 0 : void 0;
+  },
+
+  createTopicText: (function() {
+    if (this.get('controller.category.name')) {
+      return Em.String.i18n("topic.create_in", {
+        categoryName: this.get('controller.category.name')
+      });
+    } else {
+      return Em.String.i18n("topic.create");
+    }
+  }).property('controller.category.name')
+
+});
 
-    scrolled: function(e) {
-      var currentView;
-      currentView = this.get('container.currentView');
-      return currentView ? typeof currentView.scrolled === "function" ? currentView.scrolled(e) : void 0 : void 0;
-    },
-    createTopicText: (function() {
-      if (this.get('controller.category.name')) {
-        return Em.String.i18n("topic.create_in", {
-          categoryName: this.get('controller.category.name')
-        });
-      } else {
-        return Em.String.i18n("topic.create");
-      }
-    }).property('controller.category.name')
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/list/topic_list_item_view.js b/app/assets/javascripts/discourse/views/list/topic_list_item_view.js
index 59b714e10cf..d07a32ff511 100644
--- a/app/assets/javascripts/discourse/views/list/topic_list_item_view.js
+++ b/app/assets/javascripts/discourse/views/list/topic_list_item_view.js
@@ -1,37 +1,48 @@
-(function() {
+/**
+  This view handles the rendering of a topic in a list
 
-  window.Discourse.TopicListItemView = Discourse.View.extend({
-    tagName: 'tr',
-    templateName: 'list/topic_list_item',
-    classNameBindings: ['content.archived', ':topic-list-item'],
-    attributeBindings: ['data-topic-id'],
-    'data-topic-id': (function() {
-      return this.get('content.id');
-    }).property('content.id'),
-    init: function() {
-      this._super();
-      return this.set('context', this.get('content'));
-    },
-    highlight: function() {
-      var $topic, originalCol;
-      $topic = this.$();
-      originalCol = $topic.css('backgroundColor');
-      return $topic.css({
-        backgroundColor: "#ffffcc"
-      }).animate({
-        backgroundColor: originalCol
-      }, 2500);
-    },
-    didInsertElement: function() {
-      if (Discourse.get('transient.lastTopicIdViewed') === this.get('content.id')) {
-        Discourse.set('transient.lastTopicIdViewed', null);
-        this.highlight();
-        return;
-      }
-      if (this.get('content.highlightAfterInsert')) {
-        return this.highlight();
-      }
+  @class TopicListItemView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.TopicListItemView = Discourse.View.extend({
+  tagName: 'tr',
+  templateName: 'list/topic_list_item',
+  classNameBindings: ['content.archived', ':topic-list-item'],
+  attributeBindings: ['data-topic-id'],
+
+  'data-topic-id': (function() {
+    return this.get('content.id');
+  }).property('content.id'),
+
+  init: function() {
+    this._super();
+    return this.set('context', this.get('content'));
+  },
+
+  highlight: function() {
+    var $topic, originalCol;
+    $topic = this.$();
+    originalCol = $topic.css('backgroundColor');
+    return $topic.css({
+      backgroundColor: "#ffffcc"
+    }).animate({
+      backgroundColor: originalCol
+    }, 2500);
+  },
+
+  didInsertElement: function() {
+    if (Discourse.get('transient.lastTopicIdViewed') === this.get('content.id')) {
+      Discourse.set('transient.lastTopicIdViewed', null);
+      this.highlight();
+      return;
     }
-  });
+    if (this.get('content.highlightAfterInsert')) {
+      return this.highlight();
+    }
+  }
+
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/modal/archetype_options_modal_view.js b/app/assets/javascripts/discourse/views/modal/archetype_options_modal_view.js
new file mode 100644
index 00000000000..9cbfa02127e
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/modal/archetype_options_modal_view.js
@@ -0,0 +1,14 @@
+/**
+  This view handles rendering of options for an archetype
+
+  @class ArchetypeOptionsModalView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+window.Discourse.ArchetypeOptionsModalView = window.Discourse.ModalBodyView.extend({
+  templateName: 'modal/archetype_options',
+  title: Em.String.i18n('topic.options')
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/modal/archetype_options_view.js b/app/assets/javascripts/discourse/views/modal/archetype_options_view.js
index 19e9777479e..b403b37d923 100644
--- a/app/assets/javascripts/discourse/views/modal/archetype_options_view.js
+++ b/app/assets/javascripts/discourse/views/modal/archetype_options_view.js
@@ -1,24 +1,32 @@
-(function() {
+/**
+  This view handles the rendering of an archetype as an option
 
-  window.Discourse.ArchetypeOptionsView = Em.ContainerView.extend({
-    metaDataBinding: 'parentView.metaData',
-    init: function() {
-      var metaData,
-        _this = this;
-      this._super();
-      metaData = this.get('metaData');
-      return this.get('archetype.options').forEach(function(a) {
-        var checked;
+  @class ArchetypeOptionsView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ArchetypeOptionsView = Em.ContainerView.extend({
+  metaDataBinding: 'parentView.metaData',
+
+  init: function() {
+    var metaData,
+      _this = this;
+    this._super();
+    metaData = this.get('metaData');
+    return this.get('archetype.options').forEach(function(a) {
+      var checked;
+
+      if (a.option_type === 1) {
+        checked = _this.pushObject(Discourse.OptionBooleanView.create({
+          content: a,
+          checked: metaData.get(a.key) === 'true'
+        }));
+      }
+
+    });
+  }
+
+});
 
-        if (a.option_type === 1) {
-          checked = _this.pushObject(Discourse.OptionBooleanView.create({
-            content: a,
-            checked: metaData.get(a.key) === 'true'
-          }));
-        }
-        
-      });
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/modal/create_account_view.js b/app/assets/javascripts/discourse/views/modal/create_account_view.js
index 5a80c5d4104..7c5572765be 100644
--- a/app/assets/javascripts/discourse/views/modal/create_account_view.js
+++ b/app/assets/javascripts/discourse/views/modal/create_account_view.js
@@ -1,279 +1,267 @@
-(function() {
+/**
+  This view handles the create account modal
 
-  window.Discourse.CreateAccountView = Discourse.ModalBodyView.extend({
-    templateName: 'modal/create_account',
-    title: Em.String.i18n('create_account.title'),
-    uniqueUsernameValidation: null,
-    complete: false,
-    accountPasswordConfirm: 0,
-    accountChallenge: 0,
-    submitDisabled: (function() {
-      if (this.get('nameValidation.failed')) {
-        return true;
-      }
-      if (this.get('emailValidation.failed')) {
-        return true;
-      }
-      if (this.get('usernameValidation.failed')) {
-        return true;
-      }
-      if (this.get('passwordValidation.failed')) {
-        return true;
-      }
-      return false;
-    }).property('nameValidation.failed', 'emailValidation.failed', 'usernameValidation.failed', 'passwordValidation.failed'),
-    passwordRequired: (function() {
-      return this.blank('authOptions.auth_provider');
-    }).property('authOptions.auth_provider'),
-    /* Validate the name
-    */
+  @class CreateAccountView
+  @extends Discourse.ModalBodyView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.CreateAccountView = Discourse.ModalBodyView.extend({
+  templateName: 'modal/create_account',
+  title: Em.String.i18n('create_account.title'),
+  uniqueUsernameValidation: null,
+  complete: false,
+  accountPasswordConfirm: 0,
+  accountChallenge: 0,
 
-    nameValidation: (function() {
-      /* If blank, fail without a reason
-      */
-      if (this.blank('accountName')) {
-        return Discourse.InputValidation.create({
-          failed: true
-        });
-      }
-      if (this.get('accountPasswordConfirm') === 0) {
-        this.fetchConfirmationValue();
-      }
-      /* If too short
-      */
+  submitDisabled: (function() {
+    if (this.get('nameValidation.failed')) return true;
+    if (this.get('emailValidation.failed')) return true;
+    if (this.get('usernameValidation.failed')) return true;
+    if (this.get('passwordValidation.failed')) return true;
+    return false;
+  }).property('nameValidation.failed', 'emailValidation.failed', 'usernameValidation.failed', 'passwordValidation.failed'),
 
-      if (this.get('accountName').length < 3) {
-        return Discourse.InputValidation.create({
-          failed: true,
-          reason: Em.String.i18n('user.name.too_short')
-        });
-      }
-      /* Looks good!
-      */
+  passwordRequired: (function() {
+    return this.blank('authOptions.auth_provider');
+  }).property('authOptions.auth_provider'),
 
-      return Discourse.InputValidation.create({
-        ok: true,
-        reason: Em.String.i18n('user.name.ok')
-      });
-    }).property('accountName'),
-    /* Check the email address
-    */
+  // Validate the name
+  nameValidation: (function() {
 
-    emailValidation: (function() {
-      /* If blank, fail without a reason
-      */
+    // If blank, fail without a reason
+    if (this.blank('accountName')) return Discourse.InputValidation.create({ failed: true });
 
-      var email;
-      if (this.blank('accountEmail')) {
-        return Discourse.InputValidation.create({
-          failed: true
-        });
-      }
-      email = this.get("accountEmail");
-      if ((this.get('authOptions.email') === email) && this.get('authOptions.email_valid')) {
-        return Discourse.InputValidation.create({
-          ok: true,
-          reason: Em.String.i18n('user.email.authenticated', {
-            provider: this.get('authOptions.auth_provider')
-          })
-        });
-      }
-      if (Discourse.Utilities.emailValid(email)) {
-        return Discourse.InputValidation.create({
-          ok: true,
-          reason: Em.String.i18n('user.email.ok')
-        });
-      }
+    if (this.get('accountPasswordConfirm') === 0) {
+      this.fetchConfirmationValue();
+    }
+
+    // If too short
+    if (this.get('accountName').length < 3) {
       return Discourse.InputValidation.create({
         failed: true,
-        reason: Em.String.i18n('user.email.invalid')
-      });
-    }).property('accountEmail'),
-    usernameMatch: (function() {
-      if (this.get('emailValidation.failed')) {
-        if (this.shouldCheckUsernameMatch()) {
-          return this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
-            failed: true,
-            reason: Em.String.i18n('user.username.enter_email')
-          }));
-        } else {
-          return this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
-            failed: true
-          }));
-        }
-      } else if (this.shouldCheckUsernameMatch()) {
-        this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
-          failed: true,
-          reason: Em.String.i18n('user.username.checking')
-        }));
-        return this.checkUsernameAvailability();
-      }
-    }).observes('accountEmail'),
-    basicUsernameValidation: (function() {
-      this.set('uniqueUsernameValidation', null);
-      /* If blank, fail without a reason
-      */
-
-      if (this.blank('accountUsername')) {
-        return Discourse.InputValidation.create({
-          failed: true
-        });
-      }
-      /* If too short
-      */
-
-      if (this.get('accountUsername').length < 3) {
-        return Discourse.InputValidation.create({
-          failed: true,
-          reason: Em.String.i18n('user.username.too_short')
-        });
-      }
-      /* If too long
-      */
-
-      if (this.get('accountUsername').length > 15) {
-        return Discourse.InputValidation.create({
-          failed: true,
-          reason: Em.String.i18n('user.username.too_long')
-        });
-      }
-      this.checkUsernameAvailability();
-      /* Let's check it out asynchronously
-      */
-
-      return Discourse.InputValidation.create({
-        failed: true,
-        reason: Em.String.i18n('user.username.checking')
-      });
-    }).property('accountUsername'),
-    shouldCheckUsernameMatch: function() {
-      return !this.blank('accountUsername') && this.get('accountUsername').length > 2;
-    },
-    checkUsernameAvailability: Discourse.debounce(function() {
-      var _this = this;
-      if (this.shouldCheckUsernameMatch()) {
-        return Discourse.User.checkUsername(this.get('accountUsername'), this.get('accountEmail')).then(function(result) {
-          if (result.available) {
-            if (result.global_match) {
-              return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
-                ok: true,
-                reason: Em.String.i18n('user.username.global_match')
-              }));
-            } else {
-              return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
-                ok: true,
-                reason: Em.String.i18n('user.username.available')
-              }));
-            }
-          } else {
-            if (result.suggestion) {
-              if (result.global_match !== void 0 && result.global_match === false) {
-                return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
-                  failed: true,
-                  reason: Em.String.i18n('user.username.global_mismatch', result)
-                }));
-              } else {
-                return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
-                  failed: true,
-                  reason: Em.String.i18n('user.username.not_available', result)
-                }));
-              }
-            } else if (result.errors) {
-              return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
-                failed: true,
-                reason: result.errors.join(' ')
-              }));
-            } else {
-              return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
-                failed: true,
-                reason: Em.String.i18n('user.username.enter_email', result)
-              }));
-            }
-          }
-        });
-      }
-    }, 500),
-    /* Actually wait for the async name check before we're 100% sure we're good to go
-    */
-
-    usernameValidation: (function() {
-      var basicValidation, uniqueUsername;
-      basicValidation = this.get('basicUsernameValidation');
-      uniqueUsername = this.get('uniqueUsernameValidation');
-      if (uniqueUsername) {
-        return uniqueUsername;
-      }
-      return basicValidation;
-    }).property('uniqueUsernameValidation', 'basicUsernameValidation'),
-    /* Validate the password
-    */
-
-    passwordValidation: (function() {
-      var password;
-      if (!this.get('passwordRequired')) {
-        return Discourse.InputValidation.create({
-          ok: true
-        });
-      }
-      /* If blank, fail without a reason
-      */
-
-      password = this.get("accountPassword");
-      if (this.blank('accountPassword')) {
-        return Discourse.InputValidation.create({
-          failed: true
-        });
-      }
-      /* If too short
-      */
-
-      if (password.length < 6) {
-        return Discourse.InputValidation.create({
-          failed: true,
-          reason: Em.String.i18n('user.password.too_short')
-        });
-      }
-      /* Looks good!
-      */
-
-      return Discourse.InputValidation.create({
-        ok: true,
-        reason: Em.String.i18n('user.password.ok')
-      });
-    }).property('accountPassword'),
-    fetchConfirmationValue: function() {
-      var _this = this;
-      return jQuery.ajax({
-        url: '/users/hp.json',
-        success: function(json) {
-          _this.set('accountPasswordConfirm', json.value);
-          return _this.set('accountChallenge', json.challenge.split("").reverse().join(""));
-        }
-      });
-    },
-    createAccount: function() {
-      var challenge, email, name, password, passwordConfirm, username,
-        _this = this;
-      name = this.get('accountName');
-      email = this.get('accountEmail');
-      password = this.get('accountPassword');
-      username = this.get('accountUsername');
-      passwordConfirm = this.get('accountPasswordConfirm');
-      challenge = this.get('accountChallenge');
-      return Discourse.User.createAccount(name, email, password, username, passwordConfirm, challenge).then(function(result) {
-        if (result.success) {
-          _this.flash(result.message);
-          _this.set('complete', true);
-        } else {
-          _this.flash(result.message, 'error');
-        }
-        if (result.active) {
-          return window.location.reload();
-        }
-      }, function() {
-        return _this.flash(Em.String.i18n('create_account.failed'), 'error');
+        reason: Em.String.i18n('user.name.too_short')
       });
     }
-  });
 
-}).call(this);
+    // Looks good!
+    return Discourse.InputValidation.create({
+      ok: true,
+      reason: Em.String.i18n('user.name.ok')
+    });
+  }).property('accountName'),
+
+  // Check the email address
+  emailValidation: (function() {
+    // If blank, fail without a reason
+    var email;
+    if (this.blank('accountEmail')) {
+      return Discourse.InputValidation.create({
+        failed: true
+      });
+    }
+
+    email = this.get("accountEmail");
+    if ((this.get('authOptions.email') === email) && this.get('authOptions.email_valid')) {
+      return Discourse.InputValidation.create({
+        ok: true,
+        reason: Em.String.i18n('user.email.authenticated', {
+          provider: this.get('authOptions.auth_provider')
+        })
+      });
+    }
+
+    if (Discourse.Utilities.emailValid(email)) {
+      return Discourse.InputValidation.create({
+        ok: true,
+        reason: Em.String.i18n('user.email.ok')
+      });
+    }
+
+    return Discourse.InputValidation.create({
+      failed: true,
+      reason: Em.String.i18n('user.email.invalid')
+    });
+  }).property('accountEmail'),
+
+  usernameMatch: (function() {
+    if (this.get('emailValidation.failed')) {
+      if (this.shouldCheckUsernameMatch()) {
+        return this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
+          failed: true,
+          reason: Em.String.i18n('user.username.enter_email')
+        }));
+      } else {
+        return this.set('uniqueUsernameValidation', Discourse.InputValidation.create({ failed: true }));
+      }
+    } else if (this.shouldCheckUsernameMatch()) {
+      this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
+        failed: true,
+        reason: Em.String.i18n('user.username.checking')
+      }));
+      return this.checkUsernameAvailability();
+    }
+  }).observes('accountEmail'),
+
+  basicUsernameValidation: (function() {
+    this.set('uniqueUsernameValidation', null);
+
+    // If blank, fail without a reason
+    if (this.blank('accountUsername')) {
+      return Discourse.InputValidation.create({
+        failed: true
+      });
+    }
+
+    // If too short
+    if (this.get('accountUsername').length < 3) {
+      return Discourse.InputValidation.create({
+        failed: true,
+        reason: Em.String.i18n('user.username.too_short')
+      });
+    }
+
+    // If too long
+    if (this.get('accountUsername').length > 15) {
+      return Discourse.InputValidation.create({
+        failed: true,
+        reason: Em.String.i18n('user.username.too_long')
+      });
+    }
+
+    this.checkUsernameAvailability();
+    // Let's check it out asynchronously
+    return Discourse.InputValidation.create({
+      failed: true,
+      reason: Em.String.i18n('user.username.checking')
+    });
+  }).property('accountUsername'),
+
+  shouldCheckUsernameMatch: function() {
+    return !this.blank('accountUsername') && this.get('accountUsername').length > 2;
+  },
+
+  checkUsernameAvailability: Discourse.debounce(function() {
+    var _this = this;
+    if (this.shouldCheckUsernameMatch()) {
+      return Discourse.User.checkUsername(this.get('accountUsername'), this.get('accountEmail')).then(function(result) {
+        if (result.available) {
+          if (result.global_match) {
+            return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
+              ok: true,
+              reason: Em.String.i18n('user.username.global_match')
+            }));
+          } else {
+            return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
+              ok: true,
+              reason: Em.String.i18n('user.username.available')
+            }));
+          }
+        } else {
+          if (result.suggestion) {
+            if (result.global_match !== void 0 && result.global_match === false) {
+              return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
+                failed: true,
+                reason: Em.String.i18n('user.username.global_mismatch', result)
+              }));
+            } else {
+              return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
+                failed: true,
+                reason: Em.String.i18n('user.username.not_available', result)
+              }));
+            }
+          } else if (result.errors) {
+            return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
+              failed: true,
+              reason: result.errors.join(' ')
+            }));
+          } else {
+            return _this.set('uniqueUsernameValidation', Discourse.InputValidation.create({
+              failed: true,
+              reason: Em.String.i18n('user.username.enter_email', result)
+            }));
+          }
+        }
+      });
+    }
+  }, 500),
+
+  // Actually wait for the async name check before we're 100% sure we're good to go
+  usernameValidation: (function() {
+    var basicValidation, uniqueUsername;
+    basicValidation = this.get('basicUsernameValidation');
+    uniqueUsername = this.get('uniqueUsernameValidation');
+    if (uniqueUsername) {
+      return uniqueUsername;
+    }
+    return basicValidation;
+  }).property('uniqueUsernameValidation', 'basicUsernameValidation'),
+
+  // Validate the password
+  passwordValidation: (function() {
+    var password;
+    if (!this.get('passwordRequired')) {
+      return Discourse.InputValidation.create({
+        ok: true
+      });
+    }
+
+    // If blank, fail without a reason
+    password = this.get("accountPassword");
+    if (this.blank('accountPassword')) {
+      return Discourse.InputValidation.create({ failed: true });
+    }
+
+    // If too short
+    if (password.length < 6) {
+      return Discourse.InputValidation.create({
+        failed: true,
+        reason: Em.String.i18n('user.password.too_short')
+      });
+    }
+
+    // Looks good!
+    return Discourse.InputValidation.create({
+      ok: true,
+      reason: Em.String.i18n('user.password.ok')
+    });
+  }).property('accountPassword'),
+
+  fetchConfirmationValue: function() {
+    var _this = this;
+    return jQuery.ajax({
+      url: '/users/hp.json',
+      success: function(json) {
+        _this.set('accountPasswordConfirm', json.value);
+        return _this.set('accountChallenge', json.challenge.split("").reverse().join(""));
+      }
+    });
+  },
+
+  createAccount: function() {
+    var challenge, email, name, password, passwordConfirm, username,
+      _this = this;
+    name = this.get('accountName');
+    email = this.get('accountEmail');
+    password = this.get('accountPassword');
+    username = this.get('accountUsername');
+    passwordConfirm = this.get('accountPasswordConfirm');
+    challenge = this.get('accountChallenge');
+    return Discourse.User.createAccount(name, email, password, username, passwordConfirm, challenge).then(function(result) {
+      if (result.success) {
+        _this.flash(result.message);
+        _this.set('complete', true);
+      } else {
+        _this.flash(result.message, 'error');
+      }
+      if (result.active) {
+        return window.location.reload();
+      }
+    }, function() {
+      return _this.flash(Em.String.i18n('create_account.failed'), 'error');
+    });
+  }
+
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/modal/edit_category_view.js b/app/assets/javascripts/discourse/views/modal/edit_category_view.js
index 988e6e2b450..398062ddb09 100644
--- a/app/assets/javascripts/discourse/views/modal/edit_category_view.js
+++ b/app/assets/javascripts/discourse/views/modal/edit_category_view.js
@@ -1,72 +1,70 @@
-(function() {
+/**
+  A modal view for editing the basic aspects of a category
 
-  /**
-    A modal view for editing the basic aspects of a category
+  @class EditCategoryView
+  @extends Discourse.ModalBodyView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
+  templateName: 'modal/edit_category',
+  appControllerBinding: 'Discourse.appController',
 
-    @class EditCategoryView    
-    @extends Discourse.ModalBodyView
-    @namespace Discourse
-    @module Discourse
-  **/ 
-  Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
-    templateName: 'modal/edit_category',
-    appControllerBinding: 'Discourse.appController',
+  disabled: (function() {
+    if (this.get('saving')) return true;
+    if (!this.get('category.name')) return true;
+    if (!this.get('category.color')) return true;
+    return false;
+  }).property('category.name', 'category.color'),
 
-    disabled: (function() {
-      if (this.get('saving')) return true;
-      if (!this.get('category.name')) return true;
-      if (!this.get('category.color')) return true;
-      return false;
-    }).property('category.name', 'category.color'),
+  colorStyle: (function() {
+    return "background-color: #" + (this.get('category.color')) + ";";
+  }).property('category.color'),
 
-    colorStyle: (function() {
-      return "background-color: #" + (this.get('category.color')) + ";";
-    }).property('category.color'),
+  title: (function() {
+    if (this.get('category.id')) return Em.String.i18n("category.edit_long");
+    return "Create Category";
+  }).property('category.id'),
 
-    title: (function() {
-      if (this.get('category.id')) return Em.String.i18n("category.edit_long");
-      return "Create Category";
-    }).property('category.id'),
+  buttonTitle: (function() {
+    if (this.get('saving')) return Em.String.i18n("saving");
+    return this.get('title');
+  }).property('title', 'saving'),
 
-    buttonTitle: (function() {
-      if (this.get('saving')) return Em.String.i18n("saving");
-      return this.get('title');
-    }).property('title', 'saving'),
-
-    didInsertElement: function() {
-      this._super();
-      if (this.get('category')) {
-        this.set('id', this.get('category.slug'));
-      } else {
-        this.set('category', Discourse.Category.create({ color: 'AB9364' }));
-      }
-    },
-
-    showCategoryTopic: function() {
-      jQuery('#discourse-modal').modal('hide');
-      Discourse.routeTo(this.get('category.topic_url'));
-      return false;
-    },
-
-    saveSuccess: function(result) {
-      jQuery('#discourse-modal').modal('hide');
-      window.location = "/category/" + (Discourse.Utilities.categoryUrlId(result.category));
-    },
-
-    saveCategory: function() {
-      var _this = this;
-      this.set('saving', true);
-      return this.get('category').save({
-        success: function(result) {
-          _this.saveSuccess(result);
-        },
-        error: function(errors) {
-          _this.displayErrors(errors);
-          _this.set('saving', false);
-        }
-      });
+  didInsertElement: function() {
+    this._super();
+    if (this.get('category')) {
+      this.set('id', this.get('category.slug'));
+    } else {
+      this.set('category', Discourse.Category.create({ color: 'AB9364' }));
     }
+  },
+
+  showCategoryTopic: function() {
+    $('#discourse-modal').modal('hide');
+    Discourse.routeTo(this.get('category.topic_url'));
+    return false;
+  },
+
+  saveSuccess: function(result) {
+    $('#discourse-modal').modal('hide');
+    window.location = "/category/" + (Discourse.Utilities.categoryUrlId(result.category));
+  },
+
+  saveCategory: function() {
+    var _this = this;
+    this.set('saving', true);
+    return this.get('category').save({
+      success: function(result) {
+        _this.saveSuccess(result);
+      },
+      error: function(errors) {
+        _this.displayErrors(errors);
+        _this.set('saving', false);
+      }
+    });
+  }
+
+});
 
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/modal/flag_view.js b/app/assets/javascripts/discourse/views/modal/flag_view.js
new file mode 100644
index 00000000000..4fb753ec2a1
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/modal/flag_view.js
@@ -0,0 +1,84 @@
+/**
+  This view handles the modal for flagging posts
+
+  @class FlagView
+  @extends Discourse.ModalBodyView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.FlagView = Discourse.ModalBodyView.extend({
+  templateName: 'flag',
+  title: Em.String.i18n('flagging.title'),
+
+  changePostActionType: function(action) {
+    if (this.get('postActionTypeId') === action.id) return false;
+    this.set('postActionTypeId', action.id);
+    this.set('isCustomFlag', action.is_custom_flag);
+    Em.run.next(function() {
+      $("#radio_" + action.name_key).prop('checked', 'true');
+    });
+    return false;
+  },
+
+  createFlag: function() {
+    var actionType, _ref,
+      _this = this;
+    actionType = Discourse.get("site").postActionTypeById(this.get('postActionTypeId'));
+    if (_ref = this.get("post.actionByName." + (actionType.get('name_key')))) {
+      _ref.act({
+        message: this.get('customFlagMessage')
+      }).then(function() {
+        return $('#discourse-modal').modal('hide');
+      }, function(errors) {
+        return _this.displayErrors(errors);
+      });
+    }
+    return false;
+  },
+
+  customPlaceholder: (function() {
+    return Em.String.i18n("flagging.custom_placeholder");
+  }).property(),
+
+  showSubmit: (function() {
+    var m;
+    if (this.get("postActionTypeId")) {
+      if (this.get("isCustomFlag")) {
+        m = this.get("customFlagMessage");
+        return m && m.length >= 10 && m.length <= 500;
+      } else {
+        return true;
+      }
+    }
+    return false;
+  }).property("isCustomFlag", "customFlagMessage", "postActionTypeId"),
+
+  customFlagMessageChanged: (function() {
+    var len, message, minLen, _ref;
+    minLen = 10;
+    len = ((_ref = this.get('customFlagMessage')) ? _ref.length : void 0) || 0;
+    this.set("customMessageLengthClasses", "too-short custom-message-length");
+    if (len === 0) {
+      message = Em.String.i18n("flagging.custom_message.at_least", { n: minLen });
+    } else if (len < minLen) {
+      message = Em.String.i18n("flagging.custom_message.more", { n: minLen - len });
+    } else {
+      message = Em.String.i18n("flagging.custom_message.left", { n: 500 - len });
+      this.set("customMessageLengthClasses", "ok custom-message-length");
+    }
+    this.set("customMessageLength", message);
+  }).observes("customFlagMessage"),
+
+  didInsertElement: function() {
+    var $flagModal;
+    this.customFlagMessageChanged();
+    this.set('postActionTypeId', null);
+    $flagModal = $('#flag-modal');
+
+    // Would be nice if there were an EmberJs radio button to do this for us. Oh well, one should be coming
+    // in an upcoming release.
+    $("input[type='radio']", $flagModal).prop('checked', false);
+  }
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/modal/forgot_password_view.js b/app/assets/javascripts/discourse/views/modal/forgot_password_view.js
index 51a8cadbd8f..f50cf276a06 100644
--- a/app/assets/javascripts/discourse/views/modal/forgot_password_view.js
+++ b/app/assets/javascripts/discourse/views/modal/forgot_password_view.js
@@ -1,24 +1,29 @@
-(function() {
+/**
+  This view handles the modal for when a user forgets their password
 
-  window.Discourse.ForgotPasswordView = Discourse.ModalBodyView.extend({
-    templateName: 'modal/forgot_password',
-    title: Em.String.i18n('forgot_password.title'),
-    /* You need a value in the field to submit it.
-    */
+  @class ForgotPasswordView
+  @extends Discourse.ModalBodyView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ForgotPasswordView = Discourse.ModalBodyView.extend({
+  templateName: 'modal/forgot_password',
+  title: Em.String.i18n('forgot_password.title'),
 
-    submitDisabled: (function() {
-      return this.blank('accountEmailOrUsername');
-    }).property('accountEmailOrUsername'),
-    submit: function() {
-      jQuery.post("/session/forgot_password", {
-        username: this.get('accountEmailOrUsername')
-      });
-      /* don't tell people what happened, this keeps it more secure (ensure same on server)
-      */
+  // You need a value in the field to submit it.
+  submitDisabled: (function() {
+    return this.blank('accountEmailOrUsername');
+  }).property('accountEmailOrUsername'),
+
+  submit: function() {
+    jQuery.post("/session/forgot_password", {
+      username: this.get('accountEmailOrUsername')
+    });
+    // don't tell people what happened, this keeps it more secure (ensure same on server)
+    this.flash(Em.String.i18n('forgot_password.complete'));
+    return false;
+  }
+
+});
 
-      this.flash(Em.String.i18n('forgot_password.complete'));
-      return false;
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/modal/history_view.js b/app/assets/javascripts/discourse/views/modal/history_view.js
new file mode 100644
index 00000000000..474eaad1c41
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/modal/history_view.js
@@ -0,0 +1,52 @@
+/**
+  This view handles rendering of the history of a post
+
+  @class HistoryView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.HistoryView = Discourse.View.extend({
+  templateName: 'history',
+  title: 'History',
+  modalClass: 'history-modal',
+
+  loadSide: function(side) {
+    var orig, version,
+      _this = this;
+    if (this.get("version" + side)) {
+      orig = this.get('originalPost');
+      version = this.get("version" + side + ".number");
+      if (version === orig.get('version')) {
+        return this.set("post" + side, orig);
+      } else {
+        return Discourse.Post.loadVersion(orig.get('id'), version, function(post) {
+          return _this.set("post" + side, post);
+        });
+      }
+    }
+  },
+
+  changedLeftVersion: (function() {
+    return this.loadSide("Left");
+  }).observes('versionLeft'),
+
+  changedRightVersion: (function() {
+    return this.loadSide("Right");
+  }).observes('versionRight'),
+
+  didInsertElement: function() {
+    var _this = this;
+    this.set('loading', true);
+    this.set('postLeft', null);
+    this.set('postRight', null);
+    return this.get('originalPost').loadVersions(function(result) {
+      _this.set('loading', false);
+      _this.set('versionLeft', result.first());
+      _this.set('versionRight', result.last());
+      return _this.set('versions', result);
+    });
+  }
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/modal/image_selector.js b/app/assets/javascripts/discourse/views/modal/image_selector.js
new file mode 100644
index 00000000000..20de48ddd51
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/modal/image_selector.js
@@ -0,0 +1,42 @@
+/**
+  This view handles the image upload interface
+
+  @class ImageSelectorView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ImageSelectorView = Discourse.View.extend({
+  templateName: 'image_selector',
+  classNames: ['image-selector'],
+  title: 'Insert Image',
+
+  init: function() {
+    this._super();
+    return this.set('localSelected', true);
+  },
+
+  selectLocal: function() {
+    return this.set('localSelected', true);
+  },
+
+  selectRemote: function() {
+    return this.set('localSelected', false);
+  },
+
+  remoteSelected: (function() {
+    return !this.get('localSelected');
+  }).property('localSelected'),
+
+  upload: function() {
+    this.get('uploadTarget').fileupload('send', { fileInput: $('#filename-input') });
+    return $('#discourse-modal').modal('hide');
+  },
+
+  add: function() {
+    this.get('composer').addMarkdown("![image](" + ($('#fileurl-input').val()) + ")");
+    return $('#discourse-modal').modal('hide');
+  }
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/modal/invite_modal_view.js b/app/assets/javascripts/discourse/views/modal/invite_modal_view.js
index 31f07fc7f2c..85191212eab 100644
--- a/app/assets/javascripts/discourse/views/modal/invite_modal_view.js
+++ b/app/assets/javascripts/discourse/views/modal/invite_modal_view.js
@@ -1,58 +1,59 @@
-(function() {
+/**
+  A modal view for inviting a user to Discourse
+
+  @class InviteModalView
+  @extends Discourse.ModalBodyView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.InviteModalView = Discourse.ModalBodyView.extend({
+  templateName: 'modal/invite',
+  title: Em.String.i18n('topic.invite_reply.title'),
+  email: null,
+  error: false,
+  saving: false,
+  finished: false,
+
+  disabled: (function() {
+    if (this.get('saving')) return true;
+    if (this.blank('email')) return true;
+    if (!Discourse.Utilities.emailValid(this.get('email'))) return true;
+    return false;
+  }).property('email', 'saving'),
+
+  buttonTitle: (function() {
+    if (this.get('saving')) return Em.String.i18n('topic.inviting');
+    return Em.String.i18n('topic.invite_reply.title');
+  }).property('saving'),
+
+  successMessage: (function() {
+    return Em.String.i18n('topic.invite_reply.success', {
+      email: this.get('email')
+    });
+  }).property('email'),
+
+  didInsertElement: function() {
+    var _this = this;
+    Em.run.next(function() {
+      _this.$('input').focus();
+    });
+  },
+
+  createInvite: function() {
+    var _this = this;
+    this.set('saving', true);
+    this.set('error', false);
+    this.get('topic').inviteUser(this.get('email')).then(function() {
+      // Success
+      _this.set('saving', false);
+      return _this.set('finished', true);
+    }, function() {
+      // Failure
+      _this.set('error', true);
+      return _this.set('saving', false);
+    });
+    return false;
+  }
+});
 
-  window.Discourse.InviteModalView = Discourse.ModalBodyView.extend({
-    templateName: 'modal/invite',
-    title: Em.String.i18n('topic.invite_reply.title'),
-    email: null,
-    error: false,
-    saving: false,
-    finished: false,
-    disabled: (function() {
-      if (this.get('saving')) {
-        return true;
-      }
-      if (this.blank('email')) {
-        return true;
-      }
-      if (!Discourse.Utilities.emailValid(this.get('email'))) {
-        return true;
-      }
-      return false;
-    }).property('email', 'saving'),
-    buttonTitle: (function() {
-      if (this.get('saving')) {
-        return Em.String.i18n('topic.inviting');
-      }
-      return Em.String.i18n('topic.invite_reply.title');
-    }).property('saving'),
-    successMessage: (function() {
-      return Em.String.i18n('topic.invite_reply.success', {
-        email: this.get('email')
-      });
-    }).property('email'),
-    didInsertElement: function() {
-      var _this = this;
-      return Em.run.next(function() {
-        return _this.$('input').focus();
-      });
-    },
-    createInvite: function() {
-      var _this = this;
-      this.set('saving', true);
-      this.set('error', false);
-      this.get('topic').inviteUser(this.get('email')).then(function() {
-        /* Success
-        */
-        _this.set('saving', false);
-        return _this.set('finished', true);
-      }, function() {
-        /* Failure
-        */
-        _this.set('error', true);
-        return _this.set('saving', false);
-      });
-      return false;
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/modal/invite_private_modal_view.js b/app/assets/javascripts/discourse/views/modal/invite_private_modal_view.js
index e00195bb9cd..5083335345e 100644
--- a/app/assets/javascripts/discourse/views/modal/invite_private_modal_view.js
+++ b/app/assets/javascripts/discourse/views/modal/invite_private_modal_view.js
@@ -1,50 +1,52 @@
-(function() {
+/**
+  A modal view for inviting a user to private message
 
-  window.Discourse.InvitePrivateModalView = Discourse.ModalBodyView.extend({
-    templateName: 'modal/invite_private',
-    title: Em.String.i18n('topic.invite_private.title'),
-    email: null,
-    error: false,
-    saving: false,
-    finished: false,
-    disabled: (function() {
-      if (this.get('saving')) {
-        return true;
-      }
-      return this.blank('emailOrUsername');
-    }).property('emailOrUsername', 'saving'),
-    buttonTitle: (function() {
-      if (this.get('saving')) {
-        return Em.String.i18n('topic.inviting');
-      }
-      return Em.String.i18n('topic.invite_private.action');
-    }).property('saving'),
-    didInsertElement: function() {
-      var _this = this;
-      return Em.run.next(function() {
-        return _this.$('input').focus();
-      });
-    },
-    invite: function() {
-      var _this = this;
-      this.set('saving', true);
-      this.set('error', false);
-      /* Invite the user to the private conversation
-      */
+  @class InvitePrivateModalView
+  @extends Discourse.ModalBodyView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.InvitePrivateModalView = Discourse.ModalBodyView.extend({
+  templateName: 'modal/invite_private',
+  title: Em.String.i18n('topic.invite_private.title'),
+  email: null,
+  error: false,
+  saving: false,
+  finished: false,
+
+  disabled: (function() {
+    if (this.get('saving')) return true;
+    return this.blank('emailOrUsername');
+  }).property('emailOrUsername', 'saving'),
+
+  buttonTitle: (function() {
+    if (this.get('saving')) return Em.String.i18n('topic.inviting');
+    return Em.String.i18n('topic.invite_private.action');
+  }).property('saving'),
+
+  didInsertElement: function() {
+    var _this = this;
+    return Em.run.next(function() {
+      return _this.$('input').focus();
+    });
+  },
+
+  invite: function() {
+    var _this = this;
+    this.set('saving', true);
+    this.set('error', false);
+    // Invite the user to the private conversation
+    this.get('topic').inviteUser(this.get('emailOrUsername')).then(function() {
+      // Success
+      _this.set('saving', false);
+      return _this.set('finished', true);
+    }, function() {
+      // Failure
+      _this.set('error', true);
+      return _this.set('saving', false);
+    });
+    return false;
+  }
+});
 
-      this.get('topic').inviteUser(this.get('emailOrUsername')).then(function() {
-        /* Success
-        */
-        _this.set('saving', false);
-        return _this.set('finished', true);
-      }, function() {
-        /* Failure
-        */
-        _this.set('error', true);
-        return _this.set('saving', false);
-      });
-      return false;
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/modal/login_view.js b/app/assets/javascripts/discourse/views/modal/login_view.js
index ea736ccc91e..da08b01968a 100644
--- a/app/assets/javascripts/discourse/views/modal/login_view.js
+++ b/app/assets/javascripts/discourse/views/modal/login_view.js
@@ -1,140 +1,146 @@
-(function() {
+/**
+  A modal view for handling user logins
 
-  window.Discourse.LoginView = Discourse.ModalBodyView.extend({
-    templateName: 'modal/login',
-    siteBinding: 'Discourse.site',
-    title: Em.String.i18n('login.title'),
-    authenticate: null,
-    loggingIn: false,
-    
-    showView: function(view) {
-      return this.get('controller').show(view);
-    },
+  @class LoginView
+  @extends Discourse.ModalBodyView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.LoginView = Discourse.ModalBodyView.extend({
+  templateName: 'modal/login',
+  siteBinding: 'Discourse.site',
+  title: Em.String.i18n('login.title'),
+  authenticate: null,
+  loggingIn: false,
 
-    newAccount: function() {
-      return this.showView(Discourse.CreateAccountView.create());
-    },
+  showView: function(view) {
+    return this.get('controller').show(view);
+  },
 
-    forgotPassword: function() {
-      return this.showView(Discourse.ForgotPasswordView.create());
-    },
+  newAccount: function() {
+    return this.showView(Discourse.CreateAccountView.create());
+  },
 
-    loginButtonText: (function() {
-      if (this.get('loggingIn')) {
-        return Em.String.i18n('login.logging_in');
-      }
-      return Em.String.i18n('login.title');
-    }).property('loggingIn'),
+  forgotPassword: function() {
+    return this.showView(Discourse.ForgotPasswordView.create());
+  },
 
-    loginDisabled: (function() {
-      if (this.get('loggingIn')) {
-        return true;
-      }
-      if (this.blank('loginName') || this.blank('loginPassword')) {
-        return true;
-      }
-      return false;
-    }).property('loginName', 'loginPassword', 'loggingIn'),
-
-    login: function() {
-      var _this = this;
-      this.set('loggingIn', true);
-      jQuery.post("/session", {
-        login: this.get('loginName'),
-        password: this.get('loginPassword')
-      }).success(function(result) {
-        if (result.error) {
-          _this.set('loggingIn', false);
-          if( result.reason === 'not_activated' ) {
-            return _this.showView(Discourse.NotActivatedView.create({username: _this.get('loginName'), sentTo: result.sent_to_email, currentEmail: result.current_email}));
-          }
-          _this.flash(result.error, 'error');
-        } else {
-          return window.location.reload();
-        }
-      }).fail(function(result) {
-        _this.flash(Em.String.i18n('login.error'), 'error');
-        return _this.set('loggingIn', false);
-      });
-      return false;
-    },
-
-    authMessage: (function() {
-      if (this.blank('authenticate')) {
-        return "";
-      }
-      return Em.String.i18n("login." + (this.get('authenticate')) + ".message");
-    }).property('authenticate'),
-
-    twitterLogin: function() {
-      var left, top;
-      this.set('authenticate', 'twitter');
-      left = this.get('lastX') - 400;
-      top = this.get('lastY') - 200;
-      return window.open("/auth/twitter", "_blank", "menubar=no,status=no,height=400,width=800,left=" + left + ",top=" + top);
-    },
-
-    facebookLogin: function() {
-      var left, top;
-      this.set('authenticate', 'facebook');
-      left = this.get('lastX') - 400;
-      top = this.get('lastY') - 200;
-      return window.open("/auth/facebook", "_blank", "menubar=no,status=no,height=400,width=800,left=" + left + ",top=" + top);
-    },
-
-    openidLogin: function(provider) {
-      var left, top;
-      left = this.get('lastX') - 400;
-      top = this.get('lastY') - 200;
-      if (provider === "yahoo") {
-        this.set("authenticate", 'yahoo');
-        return window.open("/auth/yahoo", "_blank", "menubar=no,status=no,height=400,width=800,left=" + left + ",top=" + top);
-      } else {
-        window.open("/auth/google", "_blank", "menubar=no,status=no,height=500,width=850,left=" + left + ",top=" + top);
-        return this.set("authenticate", 'google');
-      }
-    },
-
-    authenticationComplete: function(options) {
-      if (options.awaiting_approval) {
-        this.flash(Em.String.i18n('login.awaiting_approval'), 'success');
-        this.set('authenticate', null);
-        return;
-      }
-      if (options.awaiting_activation) {
-        this.flash(Em.String.i18n('login.awaiting_confirmation'), 'success');
-        this.set('authenticate', null);
-        return;
-      }
-      // Reload the page if we're authenticated
-      if (options.authenticated) {
-        window.location.reload();
-        return;
-      }
-      return this.showView(Discourse.CreateAccountView.create({
-        accountEmail: options.email,
-        accountUsername: options.username,
-        accountName: options.name,
-        authOptions: Em.Object.create(options)
-      }));
-    },
-
-    mouseMove: function(e) {
-      this.set('lastX', e.screenX);
-      return this.set('lastY', e.screenY);
-    },
-
-    didInsertElement: function(e) {
-      var _this = this;
-      return Em.run.next(function() {
-        return jQuery('#login-account-password').keydown(function(e) {
-          if (e.keyCode === 13) {
-            return _this.login();
-          }
-        });
-      });
+  loginButtonText: (function() {
+    if (this.get('loggingIn')) {
+      return Em.String.i18n('login.logging_in');
     }
+    return Em.String.i18n('login.title');
+  }).property('loggingIn'),
+
+  loginDisabled: (function() {
+    if (this.get('loggingIn')) {
+      return true;
+    }
+    if (this.blank('loginName') || this.blank('loginPassword')) {
+      return true;
+    }
+    return false;
+  }).property('loginName', 'loginPassword', 'loggingIn'),
+
+  login: function() {
+    var _this = this;
+    this.set('loggingIn', true);
+    jQuery.post("/session", {
+      login: this.get('loginName'),
+      password: this.get('loginPassword')
+    }).success(function(result) {
+      if (result.error) {
+        _this.set('loggingIn', false);
+        if( result.reason === 'not_activated' ) {
+          return _this.showView(Discourse.NotActivatedView.create({username: _this.get('loginName'), sentTo: result.sent_to_email, currentEmail: result.current_email}));
+        }
+        _this.flash(result.error, 'error');
+      } else {
+        return window.location.reload();
+      }
+    }).fail(function(result) {
+      _this.flash(Em.String.i18n('login.error'), 'error');
+      return _this.set('loggingIn', false);
+    });
+    return false;
+  },
+
+  authMessage: (function() {
+    if (this.blank('authenticate')) {
+      return "";
+    }
+    return Em.String.i18n("login." + (this.get('authenticate')) + ".message");
+  }).property('authenticate'),
+
+  twitterLogin: function() {
+    var left, top;
+    this.set('authenticate', 'twitter');
+    left = this.get('lastX') - 400;
+    top = this.get('lastY') - 200;
+    return window.open("/auth/twitter", "_blank", "menubar=no,status=no,height=400,width=800,left=" + left + ",top=" + top);
+  },
+
+  facebookLogin: function() {
+    var left, top;
+    this.set('authenticate', 'facebook');
+    left = this.get('lastX') - 400;
+    top = this.get('lastY') - 200;
+    return window.open("/auth/facebook", "_blank", "menubar=no,status=no,height=400,width=800,left=" + left + ",top=" + top);
+  },
+
+  openidLogin: function(provider) {
+    var left, top;
+    left = this.get('lastX') - 400;
+    top = this.get('lastY') - 200;
+    if (provider === "yahoo") {
+      this.set("authenticate", 'yahoo');
+      return window.open("/auth/yahoo", "_blank", "menubar=no,status=no,height=400,width=800,left=" + left + ",top=" + top);
+    } else {
+      window.open("/auth/google", "_blank", "menubar=no,status=no,height=500,width=850,left=" + left + ",top=" + top);
+      return this.set("authenticate", 'google');
+    }
+  },
+
+  authenticationComplete: function(options) {
+    if (options.awaiting_approval) {
+      this.flash(Em.String.i18n('login.awaiting_approval'), 'success');
+      this.set('authenticate', null);
+      return;
+    }
+    if (options.awaiting_activation) {
+      this.flash(Em.String.i18n('login.awaiting_confirmation'), 'success');
+      this.set('authenticate', null);
+      return;
+    }
+    // Reload the page if we're authenticated
+    if (options.authenticated) {
+      window.location.reload();
+      return;
+    }
+    return this.showView(Discourse.CreateAccountView.create({
+      accountEmail: options.email,
+      accountUsername: options.username,
+      accountName: options.name,
+      authOptions: Em.Object.create(options)
+    }));
+  },
+
+  mouseMove: function(e) {
+    this.set('lastX', e.screenX);
+    return this.set('lastY', e.screenY);
+  },
+
+  didInsertElement: function(e) {
+    var _this = this;
+    return Em.run.next(function() {
+      return $('#login-account-password').keydown(function(e) {
+        if (e.keyCode === 13) {
+          return _this.login();
+        }
+      });
+    });
+  }
+
+});
 
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/modal/modal_body_view.js b/app/assets/javascripts/discourse/views/modal/modal_body_view.js
index f0ae1a6fb7e..1677cdc4bd7 100644
--- a/app/assets/javascripts/discourse/views/modal/modal_body_view.js
+++ b/app/assets/javascripts/discourse/views/modal/modal_body_view.js
@@ -1,29 +1,36 @@
-(function() {
+/**
+  A base class for helping us display modal content
 
-  window.Discourse.ModalBodyView = Discourse.View.extend({
-    // Focus on first element
-    didInsertElement: function() {
-      var _this = this;
-      return Em.run.next(function() {
-        return _this.$('form input:first').focus();
-      });
-    },
+  @class ModalBodyView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ModalBodyView = Discourse.View.extend({
 
-    // Pass the errors to our errors view
-    displayErrors: function(errors, callback) {
-      this.set('parentView.parentView.modalErrorsView.errors', errors);
-      return typeof callback === "function" ? callback() : void 0;
-    },
+  // Focus on first element
+  didInsertElement: function() {
+    var _this = this;
+    Em.run.next(function() {
+      _this.$('form input:first').focus();
+    });
+  },
+
+  // Pass the errors to our errors view
+  displayErrors: function(errors, callback) {
+    this.set('parentView.parentView.modalErrorsView.errors', errors);
+    typeof callback === "function" ? callback() : void 0;
+  },
+
+  // Just use jQuery to show an alert. We don't need anythign fancier for now
+  // like an actual ember view
+  flash: function(msg, flashClass) {
+    var $alert;
+    if (!flashClass) flashClass = "success";
+    $alert = $('#modal-alert').hide().removeClass('alert-error', 'alert-success');
+    $alert.addClass("alert alert-" + flashClass).html(msg);
+    $alert.fadeIn();
+  }
+});
 
-    // Just use jQuery to show an alert. We don't need anythign fancier for now
-    // like an actual ember view
-    flash: function(msg, flashClass) {
-      var $alert;
-      if (!flashClass) flashClass = "success";
-      $alert = jQuery('#modal-alert').hide().removeClass('alert-error', 'alert-success');
-      $alert.addClass("alert alert-" + flashClass).html(msg);
-      return $alert.fadeIn();
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/modal/modal_view.js b/app/assets/javascripts/discourse/views/modal/modal_view.js
index 3aaf582a625..6d1f1219a75 100644
--- a/app/assets/javascripts/discourse/views/modal/modal_view.js
+++ b/app/assets/javascripts/discourse/views/modal/modal_view.js
@@ -1,31 +1,42 @@
-(function() {
+/**
+  A base class for helping us display modal content
+
+  @class ModalView
+  @extends Ember.ContainerView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ModalView = Ember.ContainerView.extend({
+  childViews: ['modalHeaderView', 'modalBodyView', 'modalErrorsView'],
+  classNames: ['modal', 'hidden'],
+  classNameBindings: ['controller.currentView.modalClass'],
+  elementId: 'discourse-modal',
+
+  modalHeaderView: Ember.View.create({
+    templateName: 'modal/modal_header',
+    titleBinding: 'controller.currentView.title'
+  }),
+
+  modalBodyView: Ember.ContainerView.create({
+    currentViewBinding: 'controller.currentView'
+  }),
+
+  modalErrorsView: Ember.View.create({
+    templateName: 'modal/modal_errors'
+  }),
+
+  viewChanged: (function() {
+    var view,
+      _this = this;
+    this.set('modalErrorsView.errors', null);
+    if (view = this.get('controller.currentView')) {
+      $('#modal-alert').hide();
+      return Em.run.next(function() {
+        return _this.$().modal('show');
+      });
+    }
+  }).observes('controller.currentView')
+
+});
 
-  window.Discourse.ModalView = Ember.ContainerView.extend({
-    childViews: ['modalHeaderView', 'modalBodyView', 'modalErrorsView'],
-    classNames: ['modal', 'hidden'],
-    classNameBindings: ['controller.currentView.modalClass'],
-    elementId: 'discourse-modal',
-    modalHeaderView: Ember.View.create({
-      templateName: 'modal/modal_header',
-      titleBinding: 'controller.currentView.title'
-    }),
-    modalBodyView: Ember.ContainerView.create({
-      currentViewBinding: 'controller.currentView'
-    }),
-    modalErrorsView: Ember.View.create({
-      templateName: 'modal/modal_errors'
-    }),
-    viewChanged: (function() {
-      var view,
-        _this = this;
-      this.set('modalErrorsView.errors', null);
-      if (view = this.get('controller.currentView')) {
-        jQuery('#modal-alert').hide();
-        return Em.run.next(function() {
-          return _this.$().modal('show');
-        });
-      }
-    }).observes('controller.currentView')
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/modal/move_selected_view.js b/app/assets/javascripts/discourse/views/modal/move_selected_view.js
index 409759a7239..f485fec3aa5 100644
--- a/app/assets/javascripts/discourse/views/modal/move_selected_view.js
+++ b/app/assets/javascripts/discourse/views/modal/move_selected_view.js
@@ -1,50 +1,54 @@
-(function() {
+/**
+  A modal view for handling moving of posts to a new topic
 
-  window.Discourse.MoveSelectedView = Discourse.ModalBodyView.extend({
-    templateName: 'modal/move_selected',
-    title: Em.String.i18n('topic.move_selected.title'),
-    saving: false,
-    selectedCount: (function() {
-      if (!this.get('selectedPosts')) {
-        return 0;
-      }
-      return this.get('selectedPosts').length;
-    }).property('selectedPosts'),
-    buttonDisabled: (function() {
-      if (this.get('saving')) {
-        return true;
-      }
-      return this.blank('topicName');
-    }).property('saving', 'topicName'),
-    buttonTitle: (function() {
-      if (this.get('saving')) {
-        return Em.String.i18n('saving');
-      }
-      return Em.String.i18n('topic.move_selected.title');
-    }).property('saving'),
-    movePosts: function() {
-      var postIds,
-        _this = this;
-      this.set('saving', true);
-      postIds = this.get('selectedPosts').map(function(p) {
-        return p.get('id');
-      });
-      Discourse.Topic.movePosts(this.get('topic.id'), this.get('topicName'), postIds).then(function(result) {
-        if (result.success) {
-          jQuery('#discourse-modal').modal('hide');
-          return Em.run.next(function() {
-            return Discourse.routeTo(result.url);
-          });
-        } else {
-          _this.flash(Em.String.i18n('topic.move_selected.error'));
-          return _this.set('saving', false);
-        }
-      }, function() {
+  @class MoveSelectedView
+  @extends Discourse.ModalBodyView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.MoveSelectedView = Discourse.ModalBodyView.extend({
+  templateName: 'modal/move_selected',
+  title: Em.String.i18n('topic.move_selected.title'),
+  saving: false,
+
+  selectedCount: (function() {
+    if (!this.get('selectedPosts')) return 0;
+    return this.get('selectedPosts').length;
+  }).property('selectedPosts'),
+
+  buttonDisabled: (function() {
+    if (this.get('saving')) return true;
+    return this.blank('topicName');
+  }).property('saving', 'topicName'),
+
+  buttonTitle: (function() {
+    if (this.get('saving')) return Em.String.i18n('saving');
+    return Em.String.i18n('topic.move_selected.title');
+  }).property('saving'),
+
+  movePosts: function() {
+    var postIds,
+      _this = this;
+    this.set('saving', true);
+    postIds = this.get('selectedPosts').map(function(p) {
+      return p.get('id');
+    });
+    Discourse.Topic.movePosts(this.get('topic.id'), this.get('topicName'), postIds).then(function(result) {
+      if (result.success) {
+        $('#discourse-modal').modal('hide');
+        return Em.run.next(function() {
+          return Discourse.routeTo(result.url);
+        });
+      } else {
         _this.flash(Em.String.i18n('topic.move_selected.error'));
         return _this.set('saving', false);
-      });
-      return false;
-    }
-  });
+      }
+    }, function() {
+      _this.flash(Em.String.i18n('topic.move_selected.error'));
+      return _this.set('saving', false);
+    });
+    return false;
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/modal/not_activated_view.js b/app/assets/javascripts/discourse/views/modal/not_activated_view.js
index 92a435d6b30..af764ddb72c 100644
--- a/app/assets/javascripts/discourse/views/modal/not_activated_view.js
+++ b/app/assets/javascripts/discourse/views/modal/not_activated_view.js
@@ -1,5 +1,12 @@
+/**
+  A modal view for telling a user they're not activated
 
-window.Discourse.NotActivatedView = window.Discourse.ModalBodyView.extend(Discourse.Presence, {
+  @class NotActivatedView
+  @extends Discourse.ModalBodyView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.NotActivatedView = Discourse.ModalBodyView.extend({
   templateName: 'modal/not_activated',
   title: Em.String.i18n('log_in'),
   emailSent: false,
diff --git a/app/assets/javascripts/discourse/views/modal/option_boolean_view.js b/app/assets/javascripts/discourse/views/modal/option_boolean_view.js
index ebc001bc253..51b5b8e6eb7 100644
--- a/app/assets/javascripts/discourse/views/modal/option_boolean_view.js
+++ b/app/assets/javascripts/discourse/views/modal/option_boolean_view.js
@@ -1,19 +1,28 @@
-(function() {
+/**
+  A modal view for displaying the options for a topic archetype
+
+  @class OptionBooleanView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.OptionBooleanView = Discourse.View.extend({
+  classNames: ['archetype-option'],
+  composerControllerBinding: 'Discourse.router.composerController',
+  templateName: "modal/option_boolean",
+
+  checkedChanged: (function() {
+    var metaData;
+    metaData = this.get('parentView.metaData');
+    metaData.set(this.get('content.key'), this.get('checked') ? 'true' : 'false');
+    return this.get('controller.controllers.composer').saveDraft();
+  }).observes('checked'),
+
+  init: function() {
+    this._super();
+    return this.set('context', this.get('content'));
+  }
+
+});
 
-  window.Discourse.OptionBooleanView = Discourse.View.extend({
-    classNames: ['archetype-option'],
-    composerControllerBinding: 'Discourse.router.composerController',
-    templateName: "modal/option_boolean",
-    checkedChanged: (function() {
-      var metaData;
-      metaData = this.get('parentView.metaData');
-      metaData.set(this.get('content.key'), this.get('checked') ? 'true' : 'false');
-      return this.get('controller.controllers.composer').saveDraft();
-    }).observes('checked'),
-    init: function() {
-      this._super();
-      return this.set('context', this.get('content'));
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/nav_item_view.js b/app/assets/javascripts/discourse/views/nav_item_view.js
index a19c35afc63..34afd68658e 100644
--- a/app/assets/javascripts/discourse/views/nav_item_view.js
+++ b/app/assets/javascripts/discourse/views/nav_item_view.js
@@ -1,53 +1,63 @@
-(function() {
+/**
+  This view handles rendering of a navigation item
 
-  window.Discourse.NavItemView = Discourse.View.extend({
-    tagName: 'li',
-    classNameBindings: ['isActive', 'content.hasIcon:has-icon'],
-    attributeBindings: ['title'],
-    title: (function() {
-      var categoryName, extra, name;
-      name = this.get('content.name');
-      categoryName = this.get('content.categoryName');
-      if (categoryName) {
-        extra = {
-          categoryName: categoryName
-        };
-        name = "category";
-      }
-      return Ember.String.i18n("filters." + name + ".help", extra);
-    }).property("content.filter"),
-    isActive: (function() {
-      if (this.get("content.name") === this.get("controller.filterMode")) {
-        return "active";
-      }
-      return "";
-    }).property("content.name", "controller.filterMode"),
-    hidden: (function() {
-      return !this.get('content.visible');
-    }).property('content.visible'),
-    name: (function() {
-      var categoryName, extra, name;
-      name = this.get('content.name');
-      categoryName = this.get('content.categoryName');
+  @class NavItemView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.NavItemView = Discourse.View.extend({
+  tagName: 'li',
+  classNameBindings: ['isActive', 'content.hasIcon:has-icon'],
+  attributeBindings: ['title'],
+
+  title: (function() {
+    var categoryName, extra, name;
+    name = this.get('content.name');
+    categoryName = this.get('content.categoryName');
+    if (categoryName) {
       extra = {
-        count: this.get('content.count') || 0
+        categoryName: categoryName
       };
-      if (categoryName) {
-        name = 'category';
-        extra.categoryName = categoryName.capitalize();
-      }
-      return I18n.t("js.filters." + name + ".title", extra);
-    }).property('count'),
-    render: function(buffer) {
-      var content;
-      content = this.get('content');
-      buffer.push("");
-      if (content.get('hasIcon')) {
-        buffer.push("");
-      }
-      buffer.push(this.get('name'));
-      return buffer.push("");
+      name = "category";
     }
-  });
+    return Ember.String.i18n("filters." + name + ".help", extra);
+  }).property("content.filter"),
+
+  isActive: (function() {
+    if (this.get("content.name") === this.get("controller.filterMode")) return "active";
+    return "";
+  }).property("content.name", "controller.filterMode"),
+
+  hidden: (function() {
+    return !this.get('content.visible');
+  }).property('content.visible'),
+
+  name: (function() {
+    var categoryName, extra, name;
+    name = this.get('content.name');
+    categoryName = this.get('content.categoryName');
+    extra = {
+      count: this.get('content.count') || 0
+    };
+    if (categoryName) {
+      name = 'category';
+      extra.categoryName = categoryName.capitalize();
+    }
+    return I18n.t("js.filters." + name + ".title", extra);
+  }).property('count'),
+
+  render: function(buffer) {
+    var content;
+    content = this.get('content');
+    buffer.push("");
+    if (content.get('hasIcon')) {
+      buffer.push("");
+    }
+    buffer.push(this.get('name'));
+    return buffer.push("");
+  }
+
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/notifications_view.js b/app/assets/javascripts/discourse/views/notifications_view.js
index 2754f050513..f1e9501def8 100644
--- a/app/assets/javascripts/discourse/views/notifications_view.js
+++ b/app/assets/javascripts/discourse/views/notifications_view.js
@@ -1,8 +1,14 @@
-(function() {
+/**
+  This view handles rendering of a user's notifications
+
+  @class NotificationsView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.NotificationsView = Discourse.View.extend({
+  classNameBindings: ['content.read', ':notifications'],
+  templateName: 'notifications'
+});
 
-  window.Discourse.NotificationsView = Discourse.View.extend({
-    classNameBindings: ['content.read', ':notifications'],
-    templateName: 'notifications'
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/pagedown_editor.js b/app/assets/javascripts/discourse/views/pagedown_editor.js
new file mode 100644
index 00000000000..868e6decce4
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/pagedown_editor.js
@@ -0,0 +1,45 @@
+/*global Markdown:true*/
+
+/**
+  A control to support using PageDown as an Ember view.
+
+  @class PagedownEditor
+  @extends Ember.ContainerView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.PagedownEditor = Ember.ContainerView.extend({
+  elementId: 'pagedown-editor',
+
+  init: function() {
+    this._super();
+
+    // Add a button bar
+    this.pushObject(Em.View.create({ elementId: 'wmd-button-bar' }));
+    this.pushObject(Em.TextArea.create({
+      valueBinding: 'parentView.value',
+      elementId: 'wmd-input'
+    }));
+
+    this.pushObject(Em.View.createWithMixins(Discourse.Presence, {
+      elementId: 'wmd-preview',
+      classNameBindings: [':preview', 'hidden'],
+      hidden: (function() {
+        return this.blank('parentView.value');
+      }).property('parentView.value')
+    }));
+  },
+
+  didInsertElement: function() {
+    var $wmdInput;
+    $wmdInput = $('#wmd-input');
+    $wmdInput.data('init', true);
+    this.editor = new Markdown.Editor(Discourse.Utilities.markdownConverter({
+      sanitize: true
+    }));
+    return this.editor.run();
+  }
+
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/parent_view.js b/app/assets/javascripts/discourse/views/parent_view.js
index a9ca520929d..749358db416 100644
--- a/app/assets/javascripts/discourse/views/parent_view.js
+++ b/app/assets/javascripts/discourse/views/parent_view.js
@@ -1,21 +1,29 @@
-(function() {
+/*global Markdown:true*/
 
-  window.Discourse.ParentView = Discourse.EmbeddedPostView.extend({
-    previousPost: true,
-    
-    // Nice animation for when the replies appear
-    didInsertElement: function() {
-      var $parentPost;
-      this._super();
-      $parentPost = this.get('postView').$('section.parent-post');
+/**
+  A control to support embedding a post as a parent of the current post (in reply to)
 
-      // Animate unless we're on a touch device
-      if (Discourse.get('touch')) {
-        return $parentPost.show();
-      } else {
-        return $parentPost.slideDown();
-      }
+  @class ParentView
+  @extends Ember.ContainerView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ParentView = Discourse.EmbeddedPostView.extend({
+  previousPost: true,
+
+  // Nice animation for when the replies appear
+  didInsertElement: function() {
+    var $parentPost;
+    this._super();
+    $parentPost = this.get('postView').$('section.parent-post');
+
+    // Animate unless we're on a touch device
+    if (Discourse.get('touch')) {
+      $parentPost.show();
+    } else {
+      $parentPost.slideDown();
     }
-  });
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/participant_view.js b/app/assets/javascripts/discourse/views/participant_view.js
index 655201d0959..cf906684c5c 100644
--- a/app/assets/javascripts/discourse/views/participant_view.js
+++ b/app/assets/javascripts/discourse/views/participant_view.js
@@ -1,10 +1,18 @@
-(function() {
+/**
+  This view renders a participant in a topic
+
+  @class ParticipantView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ParticipantView = Discourse.View.extend({
+  templateName: 'participant',
+
+  toggled: (function() {
+    return this.get('controller.userFilters').contains(this.get('participant.username'));
+  }).property('controller.userFilters.[]')
+
+});
 
-  window.Discourse.ParticipantView = Discourse.View.extend({
-    templateName: 'participant',
-    toggled: (function() {
-      return this.get('controller.userFilters').contains(this.get('participant.username'));
-    }).property('controller.userFilters.[]')
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/post_link_view.js b/app/assets/javascripts/discourse/views/post_link_view.js
index a4090f6bf24..4023a26c245 100644
--- a/app/assets/javascripts/discourse/views/post_link_view.js
+++ b/app/assets/javascripts/discourse/views/post_link_view.js
@@ -1,24 +1,30 @@
-(function() {
+/**
+  This view renders a link within a post
 
-  window.Discourse.PostLinkView = Discourse.View.extend({
-    tagName: 'li',
-    classNameBindings: ['direction'],
-    direction: (function() {
-      if (this.get('content.reflection')) {
-        return 'incoming';
-      }
-      return null;
-    }).property('content.reflection'),
-    render: function(buffer) {
-      var clicks;
-      buffer.push("\n");
-      buffer.push("");
-      buffer.push(this.get('content.title'));
-      if (clicks = this.get('content.clicks')) {
-        buffer.push("\n" + clicks + "");
-      }
-      return buffer.push("");
+  @class PostLinkView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.PostLinkView = Discourse.View.extend({
+  tagName: 'li',
+  classNameBindings: ['direction'],
+
+  direction: (function() {
+    if (this.get('content.reflection')) return 'incoming';
+    return null;
+  }).property('content.reflection'),
+
+  render: function(buffer) {
+    var clicks;
+    buffer.push("\n");
+    buffer.push("");
+    buffer.push(this.get('content.title'));
+    if (clicks = this.get('content.clicks')) {
+      buffer.push("\n" + clicks + "");
     }
-  });
+    return buffer.push("");
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/post_menu_view.js b/app/assets/javascripts/discourse/views/post_menu_view.js
index 8e41e6c7899..8bbc689642f 100644
--- a/app/assets/javascripts/discourse/views/post_menu_view.js
+++ b/app/assets/javascripts/discourse/views/post_menu_view.js
@@ -1,193 +1,166 @@
+/**
+  This view renders a menu below a post. It uses buffered rendering for performance.
 
-/* This class replaces a containerView of many buttons, which was responsible for 100ms
-*/
+  @class PostMenuView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.PostMenuView = Discourse.View.extend({
+  tagName: 'section',
+  classNames: ['post-menu-area', 'clearfix'],
 
+  render: function(buffer) {
+    var post,
+      _this = this;
+    post = this.get('post');
+    this.renderReplies(post, buffer);
+    buffer.push("");
+  },
 
-/* of client rendering or so on a fast computer. It might be slightly uglier, but it's
-*/
+  // Delegate click actions
+  click: function(e) {
+    var $target, action, _name;
+    $target = $(e.target);
+    action = $target.data('action') || $target.parent().data('action');
+    if (!action) return;
+    return typeof this[_name = "click" + (action.capitalize())] === "function" ? this[_name]() : void 0;
+  },
 
+  // Trigger re-rendering
+  needsToRender: function() {
+    return this.rerender();
+  }.observes('post.deleted_at', 'post.flagsAvailable.@each', 'post.url', 'post.bookmarked', 'post.reply_count', 'post.showRepliesBelow', 'post.can_delete'),
 
-/* _much_ faster.
-*/
+  // Replies Button
+  renderReplies: function(post, buffer) {
+    var icon, reply_count;
+    if (!post.get('showRepliesBelow')) return;
+    reply_count = post.get('reply_count');
+    buffer.push("");
+  },
 
+  clickReplies: function() {
+    this.get('postView').showReplies();
+  },
 
-(function() {
-
-  window.Discourse.PostMenuView = Discourse.View.extend({
-    tagName: 'section',
-    classNames: ['post-menu-area', 'clearfix'],
-    /* Delegate to render#{button}
-    */
-
-    render: function(buffer) {
-      var post,
-        _this = this;
-      post = this.get('post');
-      this.renderReplies(post, buffer);
-      buffer.push("");
-    },
-    /* Delegate click actions
-    */
-
-    click: function(e) {
-      var $target, action, _name;
-      $target = jQuery(e.target);
-      action = $target.data('action') || $target.parent().data('action');
-      if (!action) {
-        return;
-      }
-      return typeof this[_name = "click" + (action.capitalize())] === "function" ? this[_name]() : void 0;
-    },
-    /* Trigger re rendering
-    */
-
-    needsToRender: (function() {
-      return this.rerender();
-    }).observes('post.deleted_at', 'post.flagsAvailable.@each', 'post.url', 'post.bookmarked', 'post.reply_count', 'post.showRepliesBelow', 'post.can_delete'),
-    /* Replies Button
-    */
-
-    renderReplies: function(post, buffer) {
-      var icon, reply_count;
-      if (!post.get('showRepliesBelow')) {
-        return;
-      }
-      reply_count = post.get('reply_count');
-      buffer.push("");
-    },
-    clickReplies: function() {
-      return this.get('postView').showReplies();
-    },
-    /* Delete button
-    */
-
-    renderDelete: function(post, buffer) {
-      if (post.get('post_number') === 1 && this.get('controller.content.can_delete')) {
-        buffer.push("");
-        return;
-      }
-      /* Show the correct button
-      */
-
-      if (post.get('deleted_at')) {
-        if (post.get('can_recover')) {
-          return buffer.push("");
-        }
-      } else if (post.get('can_delete')) {
-        return buffer.push("");
-      }
-    },
-    clickDeleteTopic: function() {
-      return this.get('controller').deleteTopic();
-    },
-    clickRecover: function() {
-      return this.get('controller').recoverPost(this.get('post'));
-    },
-    clickDelete: function() {
-      return this.get('controller').deletePost(this.get('post'));
-    },
-    /* Like button
-    */
-
-    renderLike: function(post, buffer) {
-      if (!post.get('actionByName.like.can_act')) {
-        return;
-      }
-      return buffer.push("");
-    },
-    clickLike: function() {
-      var _ref;
-      return (_ref = this.get('post.actionByName.like')) ? _ref.act() : void 0;
-    },
-    /* Flag button
-    */
-
-    renderFlag: function(post, buffer) {
-      if (!this.present('post.flagsAvailable')) {
-        return;
-      }
-      return buffer.push("");
-    },
-    clickFlag: function() {
-      return this.get('controller').showFlags(this.get('post'));
-    },
-    /* Edit button
-    */
-
-    renderEdit: function(post, buffer) {
-      if (!post.get('can_edit')) {
-        return;
-      }
-      return buffer.push("");
-    },
-    clickEdit: function() {
-      return this.get('controller').editPost(this.get('post'));
-    },
-    /* Share button
-    */
-
-    renderShare: function(post, buffer) {
-      return buffer.push("");
-    },
-    /* Reply button
-    */
-
-    renderReply: function(post, buffer) {
-      if (!this.get('controller.content.can_create_post')) {
-        return;
-      }
-      return buffer.push("");
-    },
-    clickReply: function() {
-      return this.get('controller').replyToPost(this.get('post'));
-    },
-    /* Bookmark button
-    */
-
-    renderBookmark: function(post, buffer) {
-      var icon;
-      if (!Discourse.get('currentUser')) {
-        return;
-      }
-      icon = 'bookmark';
-      if (!this.get('post.bookmarked')) {
-        icon += '-empty';
-      }
-      return buffer.push("");
-    },
-    clickBookmark: function() {
-      return this.get('post').toggleProperty('bookmarked');
+  // Delete button
+  renderDelete: function(post, buffer) {
+    if (post.get('post_number') === 1 && this.get('controller.content.can_delete')) {
+      buffer.push("");
+      return;
     }
-  });
+    // Show the correct button (undo or delete)
+    if (post.get('deleted_at')) {
+      if (post.get('can_recover')) {
+        return buffer.push("");
+      }
+    } else if (post.get('can_delete')) {
+      return buffer.push("");
+    }
+  },
+
+  clickDeleteTopic: function() {
+    this.get('controller').deleteTopic();
+  },
+
+  clickRecover: function() {
+    this.get('controller').recoverPost(this.get('post'));
+  },
+
+  clickDelete: function() {
+    this.get('controller').deletePost(this.get('post'));
+  },
+
+  // Like button
+  renderLike: function(post, buffer) {
+    if (!post.get('actionByName.like.can_act')) return;
+    return buffer.push("");
+  },
+
+  clickLike: function() {
+    var likeAction = this.get('post.actionByName.like');
+    if (likeAction) likeAction.act();
+  },
+
+  // Flag button
+  renderFlag: function(post, buffer) {
+    if (!this.present('post.flagsAvailable')) return;
+    return buffer.push("");
+  },
+
+  clickFlag: function() {
+    this.get('controller').showFlags(this.get('post'));
+  },
+
+  // Edit button
+  renderEdit: function(post, buffer) {
+    if (!post.get('can_edit')) return;
+    return buffer.push("");
+  },
+
+  clickEdit: function() {
+    this.get('controller').editPost(this.get('post'));
+  },
+
+  // Share button
+  renderShare: function(post, buffer) {
+    return buffer.push("");
+  },
+
+  // Reply button
+  renderReply: function(post, buffer) {
+    if (!this.get('controller.content.can_create_post')) return;
+    return buffer.push("");
+  },
+
+  clickReply: function() {
+    this.get('controller').replyToPost(this.get('post'));
+  },
+
+  // Bookmark button
+  renderBookmark: function(post, buffer) {
+    var icon;
+    if (!Discourse.get('currentUser')) return;
+    icon = 'bookmark';
+    if (!this.get('post.bookmarked')) {
+      icon += '-empty';
+    }
+    return buffer.push("");
+  },
+
+  clickBookmark: function() {
+    return this.get('post').toggleProperty('bookmarked');
+  }
+
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/post_view.js b/app/assets/javascripts/discourse/views/post_view.js
index 6e23cf6e3d5..22eee790b45 100644
--- a/app/assets/javascripts/discourse/views/post_view.js
+++ b/app/assets/javascripts/discourse/views/post_view.js
@@ -1,298 +1,288 @@
-(function() {
+/**
+  This view renders a post.
 
-  window.Discourse.PostView = Discourse.View.extend({
-    classNames: ['topic-post', 'clearfix'],
-    templateName: 'post',
-    classNameBindings: ['lastPostClass', 'postTypeClass', 'selectedClass', 'post.hidden:hidden', 'isDeleted:deleted', 'parentPost:replies-above'],
-    siteBinding: Ember.Binding.oneWay('Discourse.site'),
-    composeViewBinding: Ember.Binding.oneWay('Discourse.composeView'),
-    quoteButtonViewBinding: Ember.Binding.oneWay('Discourse.quoteButtonView'),
-    postBinding: 'content',
-    isDeleted: (function() {
-      return !!this.get('post.deleted_at');
-    }).property('post.deleted_at'),
-    /*TODO really we should do something cleaner here... this makes it work in debug but feels really messy
-    */
+  @class PostView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.PostView = Discourse.View.extend({
+  classNames: ['topic-post', 'clearfix'],
+  templateName: 'post',
+  classNameBindings: ['lastPostClass', 'postTypeClass', 'selectedClass', 'post.hidden:hidden', 'isDeleted:deleted', 'parentPost:replies-above'],
+  siteBinding: Ember.Binding.oneWay('Discourse.site'),
+  composeViewBinding: Ember.Binding.oneWay('Discourse.composeView'),
+  quoteButtonViewBinding: Ember.Binding.oneWay('Discourse.quoteButtonView'),
+  postBinding: 'content',
 
-    screenTrack: (function() {
-      var parentView, screenTrack;
-      parentView = this.get('parentView');
-      screenTrack = null;
-      while (parentView && !screenTrack) {
-        screenTrack = parentView.get('screenTrack');
-        parentView = parentView.get('parentView');
-      }
-      return screenTrack;
-    }).property('parentView'),
-    lastPostClass: (function() {
-      if (this.get('post.lastPost')) {
-        return 'last-post';
-      }
-    }).property('post.lastPost'),
-    postTypeClass: (function() {
-      if (this.get('post.post_type') === Discourse.get('site.post_types.moderator_action')) {
-        return 'moderator';
-      }
-      return 'regular';
-    }).property('post.post_type'),
-    selectedClass: (function() {
-      if (this.get('post.selected')) {
-        return 'selected';
-      }
-      return null;
-    }).property('post.selected'),
-    /* If the cooked content changed, add the quote controls
-    */
+  isDeleted: (function() {
+    return !!this.get('post.deleted_at');
+  }).property('post.deleted_at'),
 
-    cookedChanged: (function() {
-      var _this = this;
-      return Em.run.next(function() {
-        return _this.insertQuoteControls();
-      });
-    }).observes('post.cooked'),
-    init: function() {
-      this._super();
-      return this.set('context', this.get('content'));
-    },
-    mouseDown: function(e) {
-      var qbc;
-      if (qbc = Discourse.get('router.quoteButtonController')) {
-        return qbc.mouseDown(e);
-      }
-    },
-    mouseUp: function(e) {
-      var $target, qbc;
-      if (qbc = Discourse.get('router.quoteButtonController')) {
-        qbc.mouseUp(e);
-      }
-      if (this.get('controller.multiSelect') && (e.metaKey || e.ctrlKey)) {
-        this.toggleProperty('post.selected');
-      }
-      $target = jQuery(e.target);
-      if ($target.closest('.cooked').length === 0) {
-        return;
-      }
-      if (qbc = this.get('controller.controllers.quoteButton')) {
-        e.context = this.get('post');
-        return qbc.selectText(e);
-      }
-    },
-    selectText: (function() {
-      if (this.get('post.selected')) {
-        return Em.String.i18n('topic.multi_select.selected', {
-          count: this.get('controller.selectedCount')
-        });
-      }
-      return Em.String.i18n('topic.multi_select.select');
-    }).property('post.selected', 'controller.selectedCount'),
-    repliesHidden: (function() {
-      return !this.get('repliesShown');
-    }).property('repliesShown'),
-    /* Click on the replies button
-    */
-
-    showReplies: function() {
-      var _this = this;
-      if (this.get('repliesShown')) {
-        this.set('repliesShown', false);
-      } else {
-        this.get('post').loadReplies().then(function() {
-          return _this.set('repliesShown', true);
-        });
-      }
-      return false;
-    },
-    /* Toggle visibility of parent post
-    */
-
-    toggleParent: function(e) {
-      var $parent, post,
-        _this = this;
-      $parent = this.$('.parent-post');
-      if (this.get('parentPost')) {
-        jQuery('nav', $parent).removeClass('toggled');
-        /* Don't animate on touch
-        */
-
-        if (Discourse.get('touch')) {
-          $parent.hide();
-          this.set('parentPost', null);
-        } else {
-          $parent.slideUp(function() {
-            return _this.set('parentPost', null);
-          });
-        }
-      } else {
-        post = this.get('post');
-        this.set('loadingParent', true);
-        jQuery('nav', $parent).addClass('toggled');
-        Discourse.Post.loadByPostNumber(post.get('topic_id'), post.get('reply_to_post_number'), function(result) {
-          _this.set('loadingParent', false);
-          /* Give the post a reference back to the topic
-          */
-
-          result.topic = _this.get('post.topic');
-          return _this.set('parentPost', result);
-        });
-      }
-      return false;
-    },
-    updateQuoteElements: function($aside, desc) {
-      var expandContract, navLink, postNumber, quoteTitle, topic, topicId;
-      navLink = "";
-      quoteTitle = Em.String.i18n("post.follow_quote");
-      if (postNumber = $aside.data('post')) {
-        /* If we have a topic reference
-        */
-
-        if (topicId = $aside.data('topic')) {
-          topic = this.get('controller.content');
-          /* If it's the same topic as ours, build the URL from the topic object
-          */
-
-          if (topic && topic.get('id') === topicId) {
-            navLink = "";
-          } else {
-            /* Made up slug should be replaced with canonical URL
-            */
-
-            navLink = "";
-          }
-        } else if (topic = this.get('controller.content')) {
-          /* assume the same topic
-          */
-
-          navLink = "";
-        }
-      }
-      /* Only add the expand/contract control if it's not a full post
-      */
-
-      expandContract = "";
-      if (!$aside.data('full')) {
-        expandContract = "";
-        $aside.css('cursor', 'pointer');
-      }
-      return jQuery('.quote-controls', $aside).html("" + expandContract + navLink);
-    },
-    toggleQuote: function($aside) {
-      var $blockQuote, originalText, post, topic_id,
-        _this = this;
-      this.toggleProperty('quoteExpanded');
-      if (this.get('quoteExpanded')) {
-        this.updateQuoteElements($aside, 'chevron-up');
-        /* Show expanded quote
-        */
-
-        $blockQuote = jQuery('blockquote', $aside);
-        this.originalContents = $blockQuote.html();
-        originalText = $blockQuote.text().trim();
-        $blockQuote.html(Em.String.i18n("loading"));
-        post = this.get('post');
-        topic_id = post.get('topic_id');
-        if ($aside.data('topic')) {
-          topic_id = $aside.data('topic');
-        }
-        jQuery.getJSON("/posts/by_number/" + topic_id + "/" + ($aside.data('post')), function(result) {
-          var parsed;
-          parsed = jQuery(result.cooked);
-          parsed.replaceText(originalText, "" + originalText + "");
-          return $blockQuote.showHtml(parsed);
-        });
-      } else {
-        /* Hide expanded quote
-        */
-
-        this.updateQuoteElements($aside, 'chevron-down');
-        jQuery('blockquote', $aside).showHtml(this.originalContents);
-      }
-      return false;
-    },
-    /* Show how many times links have been clicked on
-    */
-
-    showLinkCounts: function() {
-      var link_counts,
-        _this = this;
-      if (link_counts = this.get('post.link_counts')) {
-        return link_counts.each(function(lc) {
-          if (lc.clicks > 0) {
-            return _this.$(".cooked a[href]").each(function() {
-              var link;
-              link = jQuery(this);
-              if (link.attr('href') === lc.url) {
-                return link.append("" + lc.clicks + "");
-              }
-            });
-          }
-        });
-      }
-    },
-    /* Add the quote controls to a post
-    */
-
-    insertQuoteControls: function() {
-      var _this = this;
-      return this.$('aside.quote').each(function(i, e) {
-        var $aside, $title;
-        $aside = jQuery(e);
-        _this.updateQuoteElements($aside, 'chevron-down');
-        $title = jQuery('.title', $aside);
-        /* Unless it's a full quote, allow click to expand
-        */
-
-        if (!($aside.data('full') || $title.data('has-quote-controls'))) {
-          $title.on('click', function(e) {
-            if (jQuery(e.target).is('a')) {
-              return true;
-            }
-            return _this.toggleQuote($aside);
-          });
-          return $title.data('has-quote-controls', true);
-        }
-      });
-    },
-    didInsertElement: function(e) {
-      var $contents, $post, newSize, originalCol, post, postNumber, scrollTo, _ref;
-      $post = this.$();
-      post = this.get('post');
-      /* Do we want to scroll to this post now that we've inserted it?
-      */
-
-      if (postNumber = post.get('scrollToAfterInsert')) {
-        Discourse.TopicView.scrollTo(this.get('post.topic_id'), postNumber);
-        if (postNumber === post.get('post_number')) {
-          $contents = jQuery('.topic-body .contents', $post);
-          originalCol = $contents.css('backgroundColor');
-          $contents.css({
-            backgroundColor: "#ffffcc"
-          }).animate({
-            backgroundColor: originalCol
-          }, 2500);
-        }
-      }
-      this.showLinkCounts();
-      if (_ref = this.get('screenTrack')) {
-        _ref.track(this.$().prop('id'), this.get('post.post_number'));
-      }
-      /* Add syntax highlighting
-      */
-
-      Discourse.SyntaxHighlighting.apply($post);
-      Discourse.Lightbox.apply($post);
-      /* If we're scrolling upwards, adjust the scroll position accordingly
-      */
-
-      if (scrollTo = this.get('post.scrollTo')) {
-        newSize = (jQuery(document).height() - scrollTo.height) + scrollTo.top;
-        jQuery('body').scrollTop(newSize);
-        jQuery('section.divider').addClass('fade');
-      }
-      /* Find all the quotes
-      */
-
-      return this.insertQuoteControls();
+  // TODO really we should do something cleaner here... this makes it work in debug but feels really messy
+  screenTrack: (function() {
+    var parentView, screenTrack;
+    parentView = this.get('parentView');
+    screenTrack = null;
+    while (parentView && !screenTrack) {
+      screenTrack = parentView.get('screenTrack');
+      parentView = parentView.get('parentView');
     }
-  });
+    return screenTrack;
+  }).property('parentView'),
+
+  lastPostClass: (function() {
+    if (this.get('post.lastPost')) {
+      return 'last-post';
+    }
+  }).property('post.lastPost'),
+
+  postTypeClass: (function() {
+    if (this.get('post.post_type') === Discourse.get('site.post_types.moderator_action')) {
+      return 'moderator';
+    }
+    return 'regular';
+  }).property('post.post_type'),
+
+  selectedClass: (function() {
+    if (this.get('post.selected')) {
+      return 'selected';
+    }
+    return null;
+  }).property('post.selected'),
+
+  // If the cooked content changed, add the quote controls
+  cookedChanged: (function() {
+    var _this = this;
+    return Em.run.next(function() {
+      return _this.insertQuoteControls();
+    });
+  }).observes('post.cooked'),
+
+  init: function() {
+    this._super();
+    return this.set('context', this.get('content'));
+  },
+
+  mouseDown: function(e) {
+    var qbc;
+    if (qbc = Discourse.get('router.quoteButtonController')) {
+      return qbc.mouseDown(e);
+    }
+  },
+
+  mouseUp: function(e) {
+    var $target, qbc;
+    if (qbc = Discourse.get('router.quoteButtonController')) {
+      qbc.mouseUp(e);
+    }
+    if (this.get('controller.multiSelect') && (e.metaKey || e.ctrlKey)) {
+      this.toggleProperty('post.selected');
+    }
+
+    $target = $(e.target);
+    if ($target.closest('.cooked').length === 0) return;
+    if (qbc = this.get('controller.controllers.quoteButton')) {
+      e.context = this.get('post');
+      return qbc.selectText(e);
+    }
+  },
+
+  selectText: (function() {
+    if (this.get('post.selected')) {
+      return Em.String.i18n('topic.multi_select.selected', {
+        count: this.get('controller.selectedCount')
+      });
+    }
+    return Em.String.i18n('topic.multi_select.select');
+  }).property('post.selected', 'controller.selectedCount'),
+
+  repliesHidden: (function() {
+    return !this.get('repliesShown');
+  }).property('repliesShown'),
+
+  // Click on the replies button
+  showReplies: function() {
+    var _this = this;
+    if (this.get('repliesShown')) {
+      this.set('repliesShown', false);
+    } else {
+      this.get('post').loadReplies().then(function() {
+        return _this.set('repliesShown', true);
+      });
+    }
+    return false;
+  },
+
+  // Toggle visibility of parent post
+  toggleParent: function(e) {
+    var $parent, post,
+      _this = this;
+    $parent = this.$('.parent-post');
+    if (this.get('parentPost')) {
+      $('nav', $parent).removeClass('toggled');
+      // Don't animate on touch
+      if (Discourse.get('touch')) {
+        $parent.hide();
+        this.set('parentPost', null);
+      } else {
+        $parent.slideUp(function() {
+          return _this.set('parentPost', null);
+        });
+      }
+    } else {
+      post = this.get('post');
+      this.set('loadingParent', true);
+      $('nav', $parent).addClass('toggled');
+      Discourse.Post.loadByPostNumber(post.get('topic_id'), post.get('reply_to_post_number'), function(result) {
+        _this.set('loadingParent', false);
+        // Give the post a reference back to the topic
+        result.topic = _this.get('post.topic');
+        return _this.set('parentPost', result);
+      });
+    }
+    return false;
+  },
+
+  updateQuoteElements: function($aside, desc) {
+    var expandContract, navLink, postNumber, quoteTitle, topic, topicId;
+    navLink = "";
+    quoteTitle = Em.String.i18n("post.follow_quote");
+    if (postNumber = $aside.data('post')) {
+      // If we have a topic reference
+      if (topicId = $aside.data('topic')) {
+        topic = this.get('controller.content');
+
+        // If it's the same topic as ours, build the URL from the topic object
+        if (topic && topic.get('id') === topicId) {
+          navLink = "";
+        } else {
+          // Made up slug should be replaced with canonical URL
+          navLink = "";
+        }
+      } else if (topic = this.get('controller.content')) {
+        // assume the same topic
+        navLink = "";
+      }
+    }
+    // Only add the expand/contract control if it's not a full post
+    expandContract = "";
+    if (!$aside.data('full')) {
+      expandContract = "";
+      $aside.css('cursor', 'pointer');
+    }
+    return $('.quote-controls', $aside).html("" + expandContract + navLink);
+  },
+
+  toggleQuote: function($aside) {
+    var $blockQuote, originalText, post, topic_id,
+      _this = this;
+    this.toggleProperty('quoteExpanded');
+    if (this.get('quoteExpanded')) {
+      this.updateQuoteElements($aside, 'chevron-up');
+      // Show expanded quote
+      $blockQuote = $('blockquote', $aside);
+      this.originalContents = $blockQuote.html();
+      originalText = $blockQuote.text().trim();
+      $blockQuote.html(Em.String.i18n("loading"));
+      post = this.get('post');
+      topic_id = post.get('topic_id');
+      if ($aside.data('topic')) {
+        topic_id = $aside.data('topic');
+      }
+      jQuery.getJSON("/posts/by_number/" + topic_id + "/" + ($aside.data('post')), function(result) {
+        var parsed;
+        parsed = $(result.cooked);
+        parsed.replaceText(originalText, "" + originalText + "");
+        return $blockQuote.showHtml(parsed);
+      });
+    } else {
+      // Hide expanded quote
+      this.updateQuoteElements($aside, 'chevron-down');
+      $('blockquote', $aside).showHtml(this.originalContents);
+    }
+    return false;
+  },
+
+  // Show how many times links have been clicked on
+  showLinkCounts: function() {
+    var link_counts,
+      _this = this;
+    if (link_counts = this.get('post.link_counts')) {
+      return link_counts.each(function(lc) {
+        if (lc.clicks > 0) {
+          return _this.$(".cooked a[href]").each(function() {
+            var link;
+            link = $(this);
+            if (link.attr('href') === lc.url) {
+              return link.append("" + lc.clicks + "");
+            }
+          });
+        }
+      });
+    }
+  },
+
+  // Add the quote controls to a post
+  insertQuoteControls: function() {
+    var _this = this;
+    return this.$('aside.quote').each(function(i, e) {
+      var $aside, $title;
+      $aside = $(e);
+      _this.updateQuoteElements($aside, 'chevron-down');
+      $title = $('.title', $aside);
+
+      // Unless it's a full quote, allow click to expand
+      if (!($aside.data('full') || $title.data('has-quote-controls'))) {
+        $title.on('click', function(e) {
+          if ($(e.target).is('a')) {
+            return true;
+          }
+          return _this.toggleQuote($aside);
+        });
+        return $title.data('has-quote-controls', true);
+      }
+    });
+  },
+
+  didInsertElement: function(e) {
+    var $contents, $post, newSize, originalCol, post, postNumber, scrollTo, _ref;
+    $post = this.$();
+    post = this.get('post');
+
+    // Do we want to scroll to this post now that we've inserted it?
+    if (postNumber = post.get('scrollToAfterInsert')) {
+      Discourse.TopicView.scrollTo(this.get('post.topic_id'), postNumber);
+      if (postNumber === post.get('post_number')) {
+        $contents = $('.topic-body .contents', $post);
+        originalCol = $contents.css('backgroundColor');
+        $contents.css({
+          backgroundColor: "#ffffcc"
+        }).animate({
+          backgroundColor: originalCol
+        }, 2500);
+      }
+    }
+    this.showLinkCounts();
+
+    if (_ref = this.get('screenTrack')) {
+      _ref.track(this.$().prop('id'), this.get('post.post_number'));
+    }
+
+    // Add syntax highlighting
+    Discourse.SyntaxHighlighting.apply($post);
+    Discourse.Lightbox.apply($post);
+
+    // If we're scrolling upwards, adjust the scroll position accordingly
+    if (scrollTo = this.get('post.scrollTo')) {
+      newSize = ($(document).height() - scrollTo.height) + scrollTo.top;
+      $('body').scrollTop(newSize);
+      $('section.divider').addClass('fade');
+    }
+
+    // Find all the quotes
+    return this.insertQuoteControls();
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/prepend_post_view.js b/app/assets/javascripts/discourse/views/prepend_post_view.js
index 6943ab5cc34..5df551ba197 100644
--- a/app/assets/javascripts/discourse/views/prepend_post_view.js
+++ b/app/assets/javascripts/discourse/views/prepend_post_view.js
@@ -1,10 +1,16 @@
-(function() {
+/**
+  This view allows us to prepend content to a post (for use in plugins)
+
+  @class PrependPostView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.PrependPostView = Em.ContainerView.extend({
+  init: function() {
+    this._super();
+    return this.trigger('prependPostContent');
+  }
+});
 
-  window.Discourse.PrependPostView = Em.ContainerView.extend({
-    init: function() {
-      this._super();
-      return this.trigger('prependPostContent');
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/quote_buton_view.js b/app/assets/javascripts/discourse/views/quote_buton_view.js
index 3ffb6154be1..bc83b632e15 100644
--- a/app/assets/javascripts/discourse/views/quote_buton_view.js
+++ b/app/assets/javascripts/discourse/views/quote_buton_view.js
@@ -1,40 +1,44 @@
-(function() {
+/**
+  This view is used for rendering the pop-up quote button
 
-  window.Discourse.QuoteButtonView = Discourse.View.extend({
-    classNames: ['quote-button'],
-    classNameBindings: ['hasBuffer'],
-    render: function(buffer) {
-      return buffer.push("quote reply");
-    },
-    hasBuffer: (function() {
-      if (this.present('controller.buffer')) {
-        return 'visible';
-      }
-      return null;
-    }).property('controller.buffer'),
-    willDestroyElement: function() {
-      return jQuery(document).unbind("mousedown.quote-button");
-    },
-    didInsertElement: function() {
-      /* Clear quote button if they click elsewhere
-      */
+  @class QuoteButtonView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.QuoteButtonView = Discourse.View.extend({
+  classNames: ['quote-button'],
+  classNameBindings: ['hasBuffer'],
+
+  render: function(buffer) {
+    buffer.push("quote reply");
+  },
+
+  hasBuffer: (function() {
+    if (this.present('controller.buffer')) return 'visible';
+    return null;
+  }).property('controller.buffer'),
+
+  willDestroyElement: function() {
+    $(document).unbind("mousedown.quote-button");
+  },
+
+  didInsertElement: function() {
+    // Clear quote button if they click elsewhere
+    var _this = this;
+    return $(document).bind("mousedown.quote-button", function(e) {
+      if ($(e.target).hasClass('quote-button')) return;
+      if ($(e.target).hasClass('create')) return;
+      _this.controller.mouseDown(e);
+      _this.set('controller.lastSelected', _this.get('controller.buffer'));
+      return _this.set('controller.buffer', '');
+    });
+  },
+
+  click: function(e) {
+    return this.get('controller').quoteText(e);
+  }
+
+});
 
-      var _this = this;
-      return jQuery(document).bind("mousedown.quote-button", function(e) {
-        if (jQuery(e.target).hasClass('quote-button')) {
-          return;
-        }
-        if (jQuery(e.target).hasClass('create')) {
-          return;
-        }
-        _this.controller.mouseDown(e);
-        _this.set('controller.lastSelected', _this.get('controller.buffer'));
-        return _this.set('controller.buffer', '');
-      });
-    },
-    click: function(e) {
-      return this.get('controller').quoteText(e);
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/replies_view.js b/app/assets/javascripts/discourse/views/replies_view.js
index 6c06c73a74f..1fe08f9788c 100644
--- a/app/assets/javascripts/discourse/views/replies_view.js
+++ b/app/assets/javascripts/discourse/views/replies_view.js
@@ -1,23 +1,31 @@
-(function() {
+/**
+  This view is used for rendering a list of replies below a post
+
+  @class RepliesView
+  @extends Ember.CollectionView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.RepliesView = Ember.CollectionView.extend({
+  templateName: 'replies',
+  tagName: 'section',
+  classNames: ['replies-list', 'embedded-posts', 'bottom'],
+  itemViewClass: Discourse.EmbeddedPostView,
+
+  repliesShown: (function() {
+    var $this;
+    $this = this.$();
+    if (this.get('parentView.repliesShown')) {
+      Em.run.next(function() {
+        $this.slideDown();
+      });
+    } else {
+      Em.run.next(function() {
+        $this.slideUp();
+      });
+    }
+  }).observes('parentView.repliesShown')
+
+});
 
-  window.Discourse.RepliesView = Ember.CollectionView.extend({
-    templateName: 'replies',
-    tagName: 'section',
-    classNames: ['replies-list', 'embedded-posts', 'bottom'],
-    itemViewClass: Discourse.EmbeddedPostView,
-    repliesShown: (function() {
-      var $this;
-      $this = this.$();
-      if (this.get('parentView.repliesShown')) {
-        return Em.run.next(function() {
-          return $this.slideDown();
-        });
-      } else {
-        return Em.run.next(function() {
-          return $this.slideUp();
-        });
-      }
-    }).observes('parentView.repliesShown')
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/search/search_results_type_view.js b/app/assets/javascripts/discourse/views/search/search_results_type_view.js
index 7e84c3ead39..9118744a842 100644
--- a/app/assets/javascripts/discourse/views/search/search_results_type_view.js
+++ b/app/assets/javascripts/discourse/views/search/search_results_type_view.js
@@ -1,24 +1,29 @@
-(function() {
+/**
+  This view handles the rendering of search results
 
-  window.Discourse.SearchResultsTypeView = Ember.CollectionView.extend({
-    tagName: 'ul',
-    itemViewClass: Ember.View.extend({
-      tagName: 'li',
-      templateName: (function() {
-        return "search/" + (this.get('parentView.type')) + "_result";
-      }).property('parentView.type'),
-      classNameBindings: ['selectedClass', 'parentView.type'],
-      selectedIndexBinding: 'parentView.parentView.selectedIndex',
-      /* Is this row currently selected by the keyboard?
-      */
+  @class SearchResultsTypeView
+  @extends Ember.CollectionView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.SearchResultsTypeView = Ember.CollectionView.extend({
+  tagName: 'ul',
+  itemViewClass: Ember.View.extend({
+    tagName: 'li',
+    classNameBindings: ['selectedClass', 'parentView.type'],
+    selectedIndexBinding: 'parentView.parentView.selectedIndex',
+
+    templateName: (function() {
+      return "search/" + (this.get('parentView.type')) + "_result";
+    }).property('parentView.type'),
+
+    // Is this row currently selected by the keyboard?
+    selectedClass: (function() {
+      if (this.get('content.index') === this.get('selectedIndex')) return 'selected';
+      return null;
+    }).property('selectedIndex')
+
+  })
+});
 
-      selectedClass: (function() {
-        if (this.get('content.index') === this.get('selectedIndex')) {
-          return 'selected';
-        }
-        return null;
-      }).property('selectedIndex')
-    })
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/search/search_view.js b/app/assets/javascripts/discourse/views/search/search_view.js
index 12f5b4702fe..55f4c733f41 100644
--- a/app/assets/javascripts/discourse/views/search/search_view.js
+++ b/app/assets/javascripts/discourse/views/search/search_view.js
@@ -1,149 +1,154 @@
-(function() {
+/**
+  This view handles search facilities of Discourse
 
-  window.Discourse.SearchView = Discourse.View.extend({
-    tagName: 'div',
-    classNames: ['d-dropdown'],
-    elementId: 'search-dropdown',
-    templateName: 'search',
-    didInsertElement: function() {
-      /* Delegate ESC to the composer
-      */
+  @class SearchView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+window.Discourse.SearchView = Discourse.View.extend({
+  tagName: 'div',
+  classNames: ['d-dropdown'],
+  elementId: 'search-dropdown',
+  templateName: 'search',
 
-      var _this = this;
-      return jQuery('body').on('keydown.search', function(e) {
-        if (jQuery('#search-dropdown').is(':visible')) {
-          switch (e.which) {
-            case 13:
-              return _this.select();
-            case 38:
-              return _this.moveUp();
-            case 40:
-              return _this.moveDown();
-          }
+  didInsertElement: function() {
+    // Delegate ESC to the composer
+    var _this = this;
+    return $('body').on('keydown.search', function(e) {
+      if ($('#search-dropdown').is(':visible')) {
+        switch (e.which) {
+          case 13:
+            return _this.select();
+          case 38:
+            return _this.moveUp();
+          case 40:
+            return _this.moveDown();
+        }
+      }
+    });
+  },
+
+  searchPlaceholder: (function() {
+    return Em.String.i18n("search.placeholder");
+  }).property(),
+
+  // If we need to perform another search
+  newSearchNeeded: (function() {
+    this.set('noResults', false);
+    if (this.present('term')) {
+      this.set('loading', true);
+      this.searchTerm(this.get('term'), this.get('typeFilter'));
+    } else {
+      this.set('results', null);
+    }
+    return this.set('selectedIndex', 0);
+  }).observes('term', 'typeFilter'),
+
+  showCancelFilter: (function() {
+    if (this.get('loading')) return false;
+    return this.present('typeFilter');
+  }).property('typeFilter', 'loading'),
+
+  termChanged: (function() {
+    return this.cancelType();
+  }).observes('term'),
+
+  // We can re-order them based on the context
+  content: (function() {
+    var index, order, path, results, results_hashed;
+    if (results = this.get('results')) {
+      // Make it easy to find the results by type
+      results_hashed = {};
+      results.each(function(r) {
+        results_hashed[r.type] = r;
+      });
+      path = Discourse.get('router.currentState.path');
+      // Default order
+      order = ['topic', 'category', 'user'];
+      results = (order.map(function(o) {
+        return results_hashed[o];
+      })).without(void 0);
+      index = 0;
+      results.each(function(result) {
+        return result.results.each(function(item) {
+          item.index = index++;
+        });
+      });
+    }
+    return results;
+  }).property('results'),
+
+  updateProgress: (function() {
+    var results;
+    if (results = this.get('results')) {
+      this.set('noResults', results.length === 0);
+    }
+    return this.set('loading', false);
+  }).observes('results'),
+
+  searchTerm: function(term, typeFilter) {
+    var _this = this;
+    if (this.currentSearch) {
+      this.currentSearch.abort();
+      this.currentSearch = null;
+    }
+    this.searcher = this.searcher || Discourse.debounce(function(term, typeFilter) {
+      _this.currentSearch = jQuery.ajax({
+        url: '/search',
+        data: {
+          term: term,
+          type_filter: typeFilter
+        },
+        success: function(results) {
+          return _this.set('results', results);
         }
       });
-    },
-    searchPlaceholder: (function() {
-      return Em.String.i18n("search.placeholder");
-    }).property(),
-    /* If we need to perform another search
-    */
+    }, 300);
+    return this.searcher(term, typeFilter);
+  },
 
-    newSearchNeeded: (function() {
-      this.set('noResults', false);
-      if (this.present('term')) {
-        this.set('loading', true);
-        this.searchTerm(this.get('term'), this.get('typeFilter'));
-      } else {
-        this.set('results', null);
-      }
-      return this.set('selectedIndex', 0);
-    }).observes('term', 'typeFilter'),
-    showCancelFilter: (function() {
-      if (this.get('loading')) {
-        return false;
-      }
-      return this.present('typeFilter');
-    }).property('typeFilter', 'loading'),
-    termChanged: (function() {
-      return this.cancelType();
-    }).observes('term'),
+  resultCount: (function() {
+    var count;
+    if (this.blank('content')) return 0;
+    count = 0;
+    this.get('content').each(function(result) {
+      count += result.results.length;
+    });
+    return count;
+  }).property('content'),
 
-    // We can re-order them based on the context
-    content: (function() {
-      var index, order, path, results, results_hashed;
-      if (results = this.get('results')) {
-        // Make it easy to find the results by type
-        results_hashed = {};
-        results.each(function(r) {
-          results_hashed[r.type] = r;
-        });
-        path = Discourse.get('router.currentState.path');
-        // Default order
-        order = ['topic', 'category', 'user'];
-        results = (order.map(function(o) {
-          return results_hashed[o];
-        })).without(void 0);
-        index = 0;
-        results.each(function(result) {
-          return result.results.each(function(item) {
-            item.index = index++;
-          });
-        });
-      }
-      return results;
-    }).property('results'),
-    
-    updateProgress: (function() {
-      var results;
-      if (results = this.get('results')) {
-        this.set('noResults', results.length === 0);
-      }
-      return this.set('loading', false);
-    }).observes('results'),
+  moreOfType: function(type) {
+    this.set('typeFilter', type);
+    return false;
+  },
 
-    searchTerm: function(term, typeFilter) {
-      var _this = this;
-      if (this.currentSearch) {
-        this.currentSearch.abort();
-        this.currentSearch = null;
-      }
-      this.searcher = this.searcher || Discourse.debounce(function(term, typeFilter) {
-        _this.currentSearch = jQuery.ajax({
-          url: '/search',
-          data: {
-            term: term,
-            type_filter: typeFilter
-          },
-          success: function(results) {
-            return _this.set('results', results);
-          }
-        });
-      }, 300);
-      return this.searcher(term, typeFilter);
-    },
-    resultCount: (function() {
-      var count;
-      if (this.blank('content')) {
-        return 0;
-      }
-      count = 0;
-      this.get('content').each(function(result) {
-        count += result.results.length;
-      });
-      return count;
-    }).property('content'),
-    moreOfType: function(type) {
-      this.set('typeFilter', type);
-      return false;
-    },
-    cancelType: function() {
-      this.set('typeFilter', null);
-      return false;
-    },
-    moveUp: function() {
-      if (this.get('selectedIndex') === 0) {
-        return;
-      }
-      return this.set('selectedIndex', this.get('selectedIndex') - 1);
-    },
-    moveDown: function() {
-      if (this.get('resultCount') === (this.get('selectedIndex') + 1)) {
-        return;
-      }
-      return this.set('selectedIndex', this.get('selectedIndex') + 1);
-    },
-    select: function() {
-      var href;
-      if (this.get('loading')) {
-        return;
-      }
-      href = jQuery('#search-dropdown li.selected a').prop('href');
-      if (href) {
-        Discourse.routeTo(href);
-      }
-      return false;
+  cancelType: function() {
+    this.set('typeFilter', null);
+    return false;
+  },
+
+  moveUp: function() {
+    if (this.get('selectedIndex') === 0) return;
+    return this.set('selectedIndex', this.get('selectedIndex') - 1);
+  },
+
+  moveDown: function() {
+    if (this.get('resultCount') === (this.get('selectedIndex') + 1)) return;
+    return this.set('selectedIndex', this.get('selectedIndex') + 1);
+  },
+
+  select: function() {
+    var href;
+    if (this.get('loading')) {
+      return;
     }
-  });
+    href = $('#search-dropdown li.selected a').prop('href');
+    if (href) {
+      Discourse.routeTo(href);
+    }
+    return false;
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/selected_posts_view.js b/app/assets/javascripts/discourse/views/selected_posts_view.js
index ea2de1a5519..97c38065a70 100644
--- a/app/assets/javascripts/discourse/views/selected_posts_view.js
+++ b/app/assets/javascripts/discourse/views/selected_posts_view.js
@@ -1,15 +1,21 @@
-(function() {
+/**
+  This view is used to handle the interface for multi selecting of posts.
+
+  @class SelectedPostsView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.SelectedPostsView = Discourse.View.extend({
+  elementId: 'selected-posts',
+  templateName: 'selected_posts',
+  topicBinding: 'controller.content',
+  classNameBindings: ['customVisibility'],
+
+  customVisibility: (function() {
+    if (!this.get('controller.multiSelect')) return 'hidden';
+  }).property('controller.multiSelect')
+
+});
 
-  window.Discourse.SelectedPostsView = Discourse.View.extend({
-    elementId: 'selected-posts',
-    templateName: 'selected_posts',
-    topicBinding: 'controller.content',
-    classNameBindings: ['customVisibility'],
-    customVisibility: (function() {
-      if (!this.get('controller.multiSelect')) {
-        return 'hidden';
-      }
-    }).property('controller.multiSelect')
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/share_view.js b/app/assets/javascripts/discourse/views/share_view.js
index 5b69bd84e4e..4f296c2e08e 100644
--- a/app/assets/javascripts/discourse/views/share_view.js
+++ b/app/assets/javascripts/discourse/views/share_view.js
@@ -1,55 +1,62 @@
-(function() {
+/**
+  This view is used for rendering the "share" interface for a post
 
-  window.Discourse.ShareView = Discourse.View.extend({
-    templateName: 'share',
-    elementId: 'share-link',
-    classNameBindings: ['hasLink'],
-    title: (function() {
-      if (this.get('controller.type') === 'topic') {
-        return Em.String.i18n('share.topic');
-      } else {
-        return Em.String.i18n('share.post');
-      }
-    }).property('controller.type'),
-    hasLink: (function() {
-      if (this.present('controller.link')) {
-        return 'visible';
-      }
-      return null;
-    }).property('controller.link'),
-    linkChanged: (function() {
-      if (this.present('controller.link')) {
-        return jQuery('#share-link input').val(this.get('controller.link')).select().focus();
-      }
-    }).observes('controller.link'),
-    didInsertElement: function() {
-      var _this = this;
-      jQuery('html').on('click.outside-share-link', function(e) {
-        if (_this.$().has(e.target).length !== 0) {
-          return;
-        }
-        _this.get('controller').close();
-        return true;
-      });
-      return jQuery('html').on('click.discoure-share-link', '[data-share-url]', function(e) {
-        var $currentTarget, url;
-        e.preventDefault();
-        $currentTarget = jQuery(e.currentTarget);
-        url = $currentTarget.data('share-url');
-        /* Relative urls
-        */
+  @class ShareView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ShareView = Discourse.View.extend({
+  templateName: 'share',
+  elementId: 'share-link',
+  classNameBindings: ['hasLink'],
 
-        if (url.indexOf("/") === 0) {
-          url = window.location.protocol + "//" + window.location.host + url;
-        }
-        _this.get('controller').shareLink(e, url);
-        return false;
-      });
-    },
-    willDestroyElement: function() {
-      jQuery('html').off('click.discoure-share-link');
-      jQuery('html').off('click.outside-share-link');
+  title: (function() {
+    if (this.get('controller.type') === 'topic') return Em.String.i18n('share.topic');
+    return Em.String.i18n('share.post');
+  }).property('controller.type'),
+
+  hasLink: (function() {
+    if (this.present('controller.link')) return 'visible';
+    return null;
+  }).property('controller.link'),
+
+  linkChanged: (function() {
+    if (this.present('controller.link')) {
+      $('#share-link input').val(this.get('controller.link')).select().focus();
     }
-  });
+  }).observes('controller.link'),
+
+  didInsertElement: function() {
+    var _this = this;
+    $('html').on('click.outside-share-link', function(e) {
+      if (_this.$().has(e.target).length !== 0) {
+        return;
+      }
+      _this.get('controller').close();
+      return true;
+    });
+    return $('html').on('click.discoure-share-link', '[data-share-url]', function(e) {
+      var $currentTarget, url;
+      e.preventDefault();
+      $currentTarget = $(e.currentTarget);
+      url = $currentTarget.data('share-url');
+      /* Relative urls
+      */
+
+      if (url.indexOf("/") === 0) {
+        url = window.location.protocol + "//" + window.location.host + url;
+      }
+      _this.get('controller').shareLink(e, url);
+      return false;
+    });
+  },
+
+  willDestroyElement: function() {
+    $('html').off('click.discoure-share-link');
+    $('html').off('click.outside-share-link');
+  }
+
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/suggested_topic_view.js b/app/assets/javascripts/discourse/views/suggested_topic_view.js
index 9f9333780da..4a2c901fdeb 100644
--- a/app/assets/javascripts/discourse/views/suggested_topic_view.js
+++ b/app/assets/javascripts/discourse/views/suggested_topic_view.js
@@ -1,7 +1,13 @@
-(function() {
+/**
+  This view is used for rendering a suggested topic
+
+  @class SuggestedTopicView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.SuggestedTopicView = Discourse.View.extend({
+  templateName: 'suggested_topic'
+});
 
-  Discourse.SuggestedTopicView = Discourse.View.extend({
-    templateName: 'suggested_topic'
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/topic_admin_menu_view.js b/app/assets/javascripts/discourse/views/topic_admin_menu_view.js
index 055fdd77d3a..f4bb74e0904 100644
--- a/app/assets/javascripts/discourse/views/topic_admin_menu_view.js
+++ b/app/assets/javascripts/discourse/views/topic_admin_menu_view.js
@@ -1,19 +1,28 @@
-(function() {
+/**
+  This view is used for rendering the topic admin menu
+
+  @class TopicAdminMenuView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+window.Discourse.TopicAdminMenuView = Discourse.View.extend({
+
+  willDestroyElement: function() {
+    $('html').off('mouseup.discourse-topic-admin-menu');
+  },
+
+  didInsertElement: function() {
+    var _this = this;
+    return $('html').on('mouseup.discourse-topic-admin-menu', function(e) {
+      var $target;
+      $target = $(e.target);
+      if ($target.is('button') || _this.$().has($target).length === 0) {
+        return _this.get('controller').hide();
+      }
+    });
+  }
+
+});
 
-  window.Discourse.TopicAdminMenuView = Discourse.View.extend({
-    willDestroyElement: function() {
-      return jQuery('html').off('mouseup.discourse-topic-admin-menu');
-    },
-    didInsertElement: function() {
-      var _this = this;
-      return jQuery('html').on('mouseup.discourse-topic-admin-menu', function(e) {
-        var $target;
-        $target = jQuery(e.target);
-        if ($target.is('button') || _this.$().has($target).length === 0) {
-          return _this.get('controller').hide();
-        }
-      });
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/topic_extra_info_view.js b/app/assets/javascripts/discourse/views/topic_extra_info_view.js
index 95c4780939b..6bc32c3dab4 100644
--- a/app/assets/javascripts/discourse/views/topic_extra_info_view.js
+++ b/app/assets/javascripts/discourse/views/topic_extra_info_view.js
@@ -1,16 +1,24 @@
-(function() {
+/**
+  This view is used for rendering the extra information on a topic in the header
+
+  @class TopicExtraInfoView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.TopicExtraInfoView = Ember.ContainerView.extend({
+  classNameBindings: [':extra-info-wrapper', 'controller.showExtraInfo'],
+  childViews: ['extraInfo'],
+
+  extraInfo: Em.View.createWithMixins({
+    templateName: 'topic_extra_info',
+    classNames: ['extra-info'],
+    topicBinding: 'controller.topic',
+    showFavoriteButton: (function() {
+      return Discourse.currentUser && !this.get('topic.isPrivateMessage');
+    }).property('topic.isPrivateMessage')
+  })
+
+});
 
-  Discourse.TopicExtraInfoView = Ember.ContainerView.extend({
-    classNameBindings: [':extra-info-wrapper', 'controller.showExtraInfo'],
-    childViews: ['extraInfo'],
-    extraInfo: Em.View.createWithMixins({
-      templateName: 'topic_extra_info',
-      classNames: ['extra-info'],
-      topicBinding: 'controller.topic',
-      showFavoriteButton: (function() {
-        return Discourse.currentUser && !this.get('topic.isPrivateMessage');
-      }).property('topic.isPrivateMessage')
-    })
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js b/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
index 351edc2e745..c2fe4e777d1 100644
--- a/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
+++ b/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
@@ -1,138 +1,162 @@
-(function() {
+/**
+  This view is used for rendering the buttons at the footer of the topic
 
-  window.Discourse.TopicFooterButtonsView = Ember.ContainerView.extend({
-    elementId: 'topic-footer-buttons',
-    topicBinding: 'controller.content',
-    init: function() {
-      this._super();
-      return this.createButtons();
-    },
-    /* Add the buttons below a topic
-    */
+  @class TopicFooterButtonsView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.TopicFooterButtonsView = Ember.ContainerView.extend({
+  elementId: 'topic-footer-buttons',
+  topicBinding: 'controller.content',
 
-    createButtons: function() {
-      var topic;
-      topic = this.get('topic');
-      if (Discourse.get('currentUser')) {
-        if (!topic.get('isPrivateMessage')) {
-          /* We hide some controls from private messages
-          */
+  init: function() {
+    this._super();
+    return this.createButtons();
+  },
 
-          if (this.get('topic.can_invite_to')) {
-            this.addObject(Discourse.ButtonView.create({
-              textKey: 'topic.invite_reply.title',
-              helpKey: 'topic.invite_reply.help',
-              renderIcon: function(buffer) {
-                return buffer.push("");
-              },
-              click: function() {
-                return this.get('controller').showInviteModal();
-              }
-            }));
-          }
-          this.addObject(Discourse.ButtonView.createWithMixins({
-            textKey: 'favorite.title',
-            helpKey: 'favorite.help',
-            favoriteChanged: (function() {
-              return this.rerender();
-            }).observes('controller.content.starred'),
-            click: function() {
-              return this.get('controller').toggleStar();
-            },
-            renderIcon: function(buffer) {
-              var extraClass;
-              if (this.get('controller.content.starred')) {
-                extraClass = 'starred';
-              }
-              return buffer.push("");
-            }
-          }));
+  // Add the buttons below a topic
+  createButtons: function() {
+    var topic;
+    topic = this.get('topic');
+    if (Discourse.get('currentUser')) {
+      if (!topic.get('isPrivateMessage')) {
+
+        // We hide some controls from private messages
+        if (this.get('topic.can_invite_to')) {
           this.addObject(Discourse.ButtonView.create({
-            textKey: 'topic.share.title',
-            helpKey: 'topic.share.help',
+            textKey: 'topic.invite_reply.title',
+            helpKey: 'topic.invite_reply.help',
+
             renderIcon: function(buffer) {
-              return buffer.push("");
+              buffer.push("");
             },
-            'data-share-url': topic.get('url')
+
+            click: function() {
+              return this.get('controller').showInviteModal();
+            }
           }));
         }
+
         this.addObject(Discourse.ButtonView.createWithMixins({
-          classNames: ['btn', 'btn-primary', 'create'],
-          attributeBindings: ['disabled'],
-          text: (function() {
-            var archetype, customTitle;
-            archetype = this.get('controller.content.archetype');
-            if (customTitle = this.get("parentView.replyButtonText" + (archetype.capitalize()))) {
-              return customTitle;
-            }
-            return Em.String.i18n("topic.reply.title");
-          }).property(),
+          textKey: 'favorite.title',
+          helpKey: 'favorite.help',
+
+          favoriteChanged: (function() {
+            this.rerender();
+          }).observes('controller.content.starred'),
+
+          click: function() {
+            this.get('controller').toggleStar();
+          },
+
           renderIcon: function(buffer) {
-            return buffer.push("");
-          },
-          click: function() {
-            return this.get('controller').reply();
-          },
-          helpKey: 'topic.reply.help',
-          disabled: !this.get('controller.content.can_create_post')
-        }));
-        if (!topic.get('isPrivateMessage')) {
-          this.addObject(Discourse.DropdownButtonView.createWithMixins({
-            topic: topic,
-            title: Em.String.i18n('topic.notifications.title'),
-            longDescriptionBinding: 'topic.notificationReasonText',
-            text: (function() {
-              var icon, key;
-              key = (function() {
-                switch (this.get('topic.notification_level')) {
-                  case Discourse.Topic.NotificationLevel.WATCHING:
-                    return 'watching';
-                  case Discourse.Topic.NotificationLevel.TRACKING:
-                    return 'tracking';
-                  case Discourse.Topic.NotificationLevel.REGULAR:
-                    return 'regular';
-                  case Discourse.Topic.NotificationLevel.MUTE:
-                    return 'muted';
-                }
-              }).call(this);
-              icon = (function() {
-                switch (key) {
-                  case 'watching':
-                    return ' ';
-                  case 'tracking':
-                    return ' ';
-                  case 'regular':
-                    return '';
-                  case 'muted':
-                    return ' ';
-                }
-              })();
-              return "" + icon + (Ember.String.i18n("topic.notifications." + key + ".title")) + "";
-            }).property('topic.notification_level'),
-            dropDownContent: [
-              [Discourse.Topic.NotificationLevel.WATCHING, 'topic.notifications.watching'], 
-              [Discourse.Topic.NotificationLevel.TRACKING, 'topic.notifications.tracking'], 
-              [Discourse.Topic.NotificationLevel.REGULAR, 'topic.notifications.regular'], 
-              [Discourse.Topic.NotificationLevel.MUTE, 'topic.notifications.muted']
-            ],
-            clicked: function(id) {
-              return this.get('topic').updateNotifications(id);
+            var extraClass;
+            if (this.get('controller.content.starred')) {
+              extraClass = 'starred';
             }
-          }));
-        }
-        return this.trigger('additionalButtons', this);
-      } else {
-        // If not logged in give them a login control
-        return this.addObject(Discourse.ButtonView.create({
-          textKey: 'topic.login_reply',
-          classNames: ['btn', 'btn-primary', 'create'],
-          click: function() {
-            var _ref;
-            return (_ref = this.get('controller.controllers.modal')) ? _ref.show(Discourse.LoginView.create()) : void 0;
+            return buffer.push("");
+          }
+        }));
+
+        this.addObject(Discourse.ButtonView.create({
+          textKey: 'topic.share.title',
+          helpKey: 'topic.share.help',
+          'data-share-url': topic.get('url'),
+
+          renderIcon: function(buffer) {
+            buffer.push("");
           }
         }));
       }
-    }
-  });
 
-}).call(this);
+      this.addObject(Discourse.ButtonView.createWithMixins({
+        classNames: ['btn', 'btn-primary', 'create'],
+        attributeBindings: ['disabled'],
+        helpKey: 'topic.reply.help',
+        disabled: !this.get('controller.content.can_create_post'),
+
+        text: (function() {
+          var archetype, customTitle;
+          archetype = this.get('controller.content.archetype');
+          if (customTitle = this.get("parentView.replyButtonText" + (archetype.capitalize()))) {
+            return customTitle;
+          }
+          return Em.String.i18n("topic.reply.title");
+        }).property(),
+
+        renderIcon: function(buffer) {
+          buffer.push("");
+        },
+
+        click: function() {
+          this.get('controller').reply();
+        }
+      }));
+
+      if (!topic.get('isPrivateMessage')) {
+        this.addObject(Discourse.DropdownButtonView.createWithMixins({
+          topic: topic,
+          title: Em.String.i18n('topic.notifications.title'),
+          longDescriptionBinding: 'topic.notificationReasonText',
+
+          text: (function() {
+            var icon, key;
+            key = (function() {
+              switch (this.get('topic.notification_level')) {
+                case Discourse.Topic.NotificationLevel.WATCHING:
+                  return 'watching';
+                case Discourse.Topic.NotificationLevel.TRACKING:
+                  return 'tracking';
+                case Discourse.Topic.NotificationLevel.REGULAR:
+                  return 'regular';
+                case Discourse.Topic.NotificationLevel.MUTE:
+                  return 'muted';
+              }
+            }).call(this);
+
+            icon = (function() {
+              switch (key) {
+                case 'watching':
+                  return ' ';
+                case 'tracking':
+                  return ' ';
+                case 'regular':
+                  return '';
+                case 'muted':
+                  return ' ';
+              }
+            })();
+            return icon + (Ember.String.i18n("topic.notifications." + key + ".title")) + "";
+          }).property('topic.notification_level'),
+
+          dropDownContent: [
+            [Discourse.Topic.NotificationLevel.WATCHING, 'topic.notifications.watching'],
+            [Discourse.Topic.NotificationLevel.TRACKING, 'topic.notifications.tracking'],
+            [Discourse.Topic.NotificationLevel.REGULAR, 'topic.notifications.regular'],
+            [Discourse.Topic.NotificationLevel.MUTE, 'topic.notifications.muted']
+          ],
+
+          clicked: function(id) {
+            return this.get('topic').updateNotifications(id);
+          }
+
+        }));
+      }
+      return this.trigger('additionalButtons', this);
+
+    } else {
+      // If not logged in give them a login control
+      return this.addObject(Discourse.ButtonView.create({
+        textKey: 'topic.login_reply',
+        classNames: ['btn', 'btn-primary', 'create'],
+        click: function() {
+          var _ref;
+          return (_ref = this.get('controller.controllers.modal')) ? _ref.show(Discourse.LoginView.create()) : void 0;
+        }
+      }));
+    }
+  }
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/topic_posts_view.js b/app/assets/javascripts/discourse/views/topic_posts_view.js
index 6e77201a7df..ff7459b5e0b 100644
--- a/app/assets/javascripts/discourse/views/topic_posts_view.js
+++ b/app/assets/javascripts/discourse/views/topic_posts_view.js
@@ -1,10 +1,16 @@
-(function() {
+/**
+  This view is for rendering the posts in a topic
+
+  @class TopicPostsView
+  @extends Ember.CollectionView
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.TopicPostsView = Em.CollectionView.extend({
+  itemViewClass: Discourse.PostView,
+  didInsertElement: function() {
+    this.get('topicView').postsRendered();
+  }
+});
 
-  window.Discourse.TopicPostsView = Em.CollectionView.extend({
-    itemViewClass: Discourse.PostView,
-    didInsertElement: function() {
-      return this.get('topicView').postsRendered();
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/topic_status_view.js b/app/assets/javascripts/discourse/views/topic_status_view.js
index e4cd2cc8973..120d9eefdbf 100644
--- a/app/assets/javascripts/discourse/views/topic_status_view.js
+++ b/app/assets/javascripts/discourse/views/topic_status_view.js
@@ -1,48 +1,50 @@
-(function() {
+/**
+  This view is for rendering an icon representing the status of a topic
 
-  window.Discourse.TopicStatusView = Discourse.View.extend({
-    classNames: ['topic-statuses'],
-    hasDisplayableStatus: (function() {
-      if (this.get('topic.closed')) {
-        return true;
-      }
-      if (this.get('topic.pinned')) {
-        return true;
-      }
-      if (!this.get('topic.archetype.isDefault')) {
-        return true;
-      }
-      if (!this.get('topic.visible')) {
-        return true;
-      }
-      return false;
-    }).property('topic.closed', 'topic.pinned', 'topic.visible'),
-    statusChanged: (function() {
-      return this.rerender();
-    }).observes('topic.closed', 'topic.pinned', 'topic.visible'),
-    renderIcon: function(buffer, name, key) {
-      var title;
-      title = Em.String.i18n("topic_statuses." + key + ".help");
-      return buffer.push("");
-    },
-    render: function(buffer) {
-      if (!this.get('hasDisplayableStatus')) {
-        return;
-      }
-      /* Allow a plugin to add a custom icon to a topic
-      */
+  @class TopicStatusView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.TopicStatusView = Discourse.View.extend({
+  classNames: ['topic-statuses'],
 
-      this.trigger('addCustomIcon', buffer);
-      if (this.get('topic.closed')) {
-        this.renderIcon(buffer, 'lock', 'locked');
-      }
-      if (this.get('topic.pinned')) {
-        this.renderIcon(buffer, 'pushpin', 'pinned');
-      }
-      if (!this.get('topic.visible')) {
-        return this.renderIcon(buffer, 'eye-close', 'invisible');
-      }
+  hasDisplayableStatus: (function() {
+    if (this.get('topic.closed')) return true;
+    if (this.get('topic.pinned')) return true;
+    if (!this.get('topic.archetype.isDefault')) return true;
+    if (!this.get('topic.visible')) return true;
+    return false;
+  }).property('topic.closed', 'topic.pinned', 'topic.visible'),
+
+  statusChanged: (function() {
+    this.rerender();
+  }).observes('topic.closed', 'topic.pinned', 'topic.visible'),
+
+  renderIcon: function(buffer, name, key) {
+    var title;
+    title = Em.String.i18n("topic_statuses." + key + ".help");
+    return buffer.push("");
+  },
+
+  render: function(buffer) {
+    if (!this.get('hasDisplayableStatus')) return;
+
+    // Allow a plugin to add a custom icon to a topic
+    this.trigger('addCustomIcon', buffer);
+
+    if (this.get('topic.closed')) {
+      this.renderIcon(buffer, 'lock', 'locked');
     }
-  });
 
-}).call(this);
+    if (this.get('topic.pinned')) {
+      this.renderIcon(buffer, 'pushpin', 'pinned');
+    }
+
+    if (!this.get('topic.visible')) {
+      this.renderIcon(buffer, 'eye-close', 'invisible');
+    }
+  }
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/topic_summary/topic_links_view.js b/app/assets/javascripts/discourse/views/topic_summary/topic_links_view.js
deleted file mode 100644
index 6d9e4e08d79..00000000000
--- a/app/assets/javascripts/discourse/views/topic_summary/topic_links_view.js
+++ /dev/null
@@ -1,7 +0,0 @@
-(function() {
-
-  window.Discourse.TopicLinksView = Discourse.View.extend({
-    templateName: 'topic_summary/links'
-  });
-
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/topic_summary/topic_summary_view.js b/app/assets/javascripts/discourse/views/topic_summary/topic_summary_view.js
index 05d0f621591..fb40c680d71 100644
--- a/app/assets/javascripts/discourse/views/topic_summary/topic_summary_view.js
+++ b/app/assets/javascripts/discourse/views/topic_summary/topic_summary_view.js
@@ -1,88 +1,83 @@
-(function() {
+/**
+  This view handles rendering of the summary of the topic under the first post
 
-  window.Discourse.TopicSummaryView = Ember.ContainerView.extend(Discourse.Presence, {
-    topicBinding: 'controller.content',
-    classNameBindings: ['hidden', ':topic-summary'],
-    LINKS_SHOWN: 5,
-    collapsed: true,
-    allLinksShown: false,
-    showAllLinksControls: (function() {
-      if (this.blank('topic.links')) {
-        return false;
-      }
-      if (this.get('allLinksShown')) {
-        return false;
-      }
-      if (this.get('topic.links.length') <= this.LINKS_SHOWN) {
-        return false;
-      }
-      return true;
-    }).property('allLinksShown', 'topic.links'),
-    infoLinks: (function() {
-      var allLinks;
-      if (this.blank('topic.links')) {
-        return [];
-      }
-      allLinks = this.get('topic.links');
-      if (this.get('allLinksShown')) {
-        return allLinks;
-      }
-      return allLinks.slice(0, this.LINKS_SHOWN);
-    }).property('topic.links', 'allLinksShown'),
-    newPostCreated: (function() {
-      return this.rerender();
-    }).observes('topic.posts_count'),
-    hidden: (function() {
-      if (this.get('post.post_number') !== 1) {
-        return true;
-      }
-      if (this.get('controller.content.archetype') === 'private_message') {
-        return false;
-      }
-      if (this.get('controller.content.archetype') !== 'regular') {
-        return true;
-      }
-      return this.get('controller.content.posts_count') < 2;
-    }).property(),
-    init: function() {
-      this._super();
-      if (this.get('hidden')) {
-        return;
-      }
-      this.pushObject(Em.View.create({
-        templateName: 'topic_summary/info',
-        topic: this.get('topic'),
-        summaryView: this
+  @class TopicSummaryView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.TopicSummaryView = Ember.ContainerView.extend(Discourse.Presence, {
+  topicBinding: 'controller.content',
+  classNameBindings: ['hidden', ':topic-summary'],
+  LINKS_SHOWN: 5,
+  collapsed: true,
+  allLinksShown: false,
+
+  showAllLinksControls: (function() {
+    if (this.blank('topic.links')) return false;
+    if (this.get('allLinksShown')) return false;
+    if (this.get('topic.links.length') <= this.LINKS_SHOWN) return false;
+    return true;
+  }).property('allLinksShown', 'topic.links'),
+
+  infoLinks: (function() {
+    var allLinks;
+    if (this.blank('topic.links')) return [];
+    allLinks = this.get('topic.links');
+    if (this.get('allLinksShown')) return allLinks;
+    return allLinks.slice(0, this.LINKS_SHOWN);
+  }).property('topic.links', 'allLinksShown'),
+
+  newPostCreated: (function() {
+    return this.rerender();
+  }).observes('topic.posts_count'),
+
+  hidden: (function() {
+    if (this.get('post.post_number') !== 1) return true;
+    if (this.get('controller.content.archetype') === 'private_message') return false;
+    if (this.get('controller.content.archetype') !== 'regular') return true;
+    return this.get('controller.content.posts_count') < 2;
+  }).property(),
+
+  init: function() {
+    this._super();
+    if (this.get('hidden')) return;
+    this.pushObject(Em.View.create({
+      templateName: 'topic_summary/info',
+      topic: this.get('topic'),
+      summaryView: this
+    }));
+    return this.trigger('appendSummaryInformation', this);
+  },
+
+  toggleMore: function() {
+    return this.toggleProperty('collapsed');
+  },
+
+  showAllLinks: function() {
+    return this.set('allLinksShown', true);
+  },
+
+  appendSummaryInformation: function(container) {
+
+    // If we have a best of view
+    if (this.get('controller.showBestOf')) {
+      container.pushObject(Em.View.create({
+        templateName: 'topic_summary/best_of_toggle',
+        tagName: 'section',
+        classNames: ['information']
       }));
-      return this.trigger('appendSummaryInformation', this);
-    },
-    toggleMore: function() {
-      return this.toggleProperty('collapsed');
-    },
-    showAllLinks: function() {
-      return this.set('allLinksShown', true);
-    },
-    appendSummaryInformation: function(container) {
-      /* If we have a best of view
-      */
-      if (this.get('controller.showBestOf')) {
-        container.pushObject(Em.View.create({
-          templateName: 'topic_summary/best_of_toggle',
-          tagName: 'section',
-          classNames: ['information']
-        }));
-      }
-      /* If we have a private message
-      */
-
-      if (this.get('topic.isPrivateMessage')) {
-        return container.pushObject(Em.View.create({
-          templateName: 'topic_summary/private_message',
-          tagName: 'section',
-          classNames: ['information']
-        }));
-      }
     }
-  });
 
-}).call(this);
+    // If we have a private message
+    if (this.get('topic.isPrivateMessage')) {
+      return container.pushObject(Em.View.create({
+        templateName: 'topic_summary/private_message',
+        tagName: 'section',
+        classNames: ['information']
+      }));
+    }
+  }
+});
+
+
diff --git a/app/assets/javascripts/discourse/views/topic_view.js b/app/assets/javascripts/discourse/views/topic_view.js
index 75acd9cd210..9da147f19bc 100644
--- a/app/assets/javascripts/discourse/views/topic_view.js
+++ b/app/assets/javascripts/discourse/views/topic_view.js
@@ -1,550 +1,507 @@
-(function() {
+/**
+  This view is for rendering an icon representing the status of a topic
 
-  window.Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
-    templateName: 'topic',
-    topicBinding: 'controller.content',
-    userFiltersBinding: 'controller.userFilters',
-    classNameBindings: ['controller.multiSelect:multi-select', 'topic.archetype'],
-    siteBinding: 'Discourse.site',
-    categoriesBinding: 'site.categories',
-    progressPosition: 1,
-    menuVisible: true,
-    SHORT_POST: 1200,
-    /* Update the progress bar using sweet animations
-    */
+  @class TopicView
+  @extends Discourse.View
+  @namespace Discourse
+  @uses Discourse.Scrolling
+  @module Discourse
+**/
+Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
+  templateName: 'topic',
+  topicBinding: 'controller.content',
+  userFiltersBinding: 'controller.userFilters',
+  classNameBindings: ['controller.multiSelect:multi-select', 'topic.archetype'],
+  siteBinding: 'Discourse.site',
+  categoriesBinding: 'site.categories',
+  progressPosition: 1,
+  menuVisible: true,
+  SHORT_POST: 1200,
 
-    updateBar: (function() {
-      var $topicProgress, bg, currentWidth, progressWidth, ratio, totalWidth;
-      if (!this.get('topic.loaded')) {
-        return;
-      }
-      $topicProgress = jQuery('#topic-progress');
-      if (!$topicProgress.length) {
-        return;
-      }
-      /* Don't show progress when there is only one post
-      */
+  // Update the progress bar using sweet animations
+  updateBar: (function() {
+    var $topicProgress, bg, currentWidth, progressWidth, ratio, totalWidth;
+    if (!this.get('topic.loaded')) return;
+    $topicProgress = $('#topic-progress');
+    if (!$topicProgress.length) return;
 
-      if (this.get('topic.highest_post_number') === 1) {
-        $topicProgress.hide();
-      } else {
-        $topicProgress.show();
-      }
-      ratio = this.get('progressPosition') / this.get('topic.highest_post_number');
-      totalWidth = $topicProgress.width();
-      progressWidth = ratio * totalWidth;
-      bg = $topicProgress.find('.bg');
-      bg.stop(true, true);
-      currentWidth = bg.width();
-      if (currentWidth === totalWidth) {
-        bg.width(currentWidth - 1);
-      }
-      if (progressWidth === totalWidth) {
-        bg.css("border-right-width", "0px");
-      } else {
-        bg.css("border-right-width", "1px");
-      }
-      if (currentWidth === 0) {
-        return bg.width(progressWidth);
-      } else {
-        return bg.animate({
-          width: progressWidth
-        }, 400);
-      }
-    }).observes('progressPosition', 'topic.highest_post_number', 'topic.loaded'),
-    updateTitle: (function() {
-      var title;
-      title = this.get('topic.title');
-      if (title) {
-        return Discourse.set('title', title);
-      }
-    }).observes('topic.loaded', 'topic.title'),
-    newPostsPresent: (function() {
-      if (this.get('topic.highest_post_number')) {
-        this.updateBar();
-        return this.examineRead();
-      }
-    }).observes('topic.highest_post_number'),
-    currentPostChanged: (function() {
-      var current, postUrl, topic;
-      current = this.get('controller.currentPost');
-      topic = this.get('topic');
-      if (!(current && topic)) {
-        return;
-      }
-      if (current > (this.get('maxPost') || 0)) {
-        this.set('maxPost', current);
-      }
-      postUrl = topic.get('url');
-      if (current > 1) {
-        postUrl += "/" + current;
-      } else {
-        if (this.get('controller.bestOf')) {
-          postUrl += "/best_of";
-        }
-      }
-      Discourse.replaceState(postUrl);
-      /* Show appropriate jump tools
-      */
+    // Don't show progress when there is only one post
+    if (this.get('topic.highest_post_number') === 1) {
+      $topicProgress.hide();
+    } else {
+      $topicProgress.show();
+    }
 
-      if (current === 1) {
-        jQuery('#jump-top').attr('disabled', true);
-      } else {
-        jQuery('#jump-top').attr('disabled', false);
-      }
-      if (current === this.get('topic.highest_post_number')) {
-        return jQuery('#jump-bottom').attr('disabled', true);
-      } else {
-        return jQuery('#jump-bottom').attr('disabled', false);
-      }
-    }).observes('controller.currentPost', 'controller.bestOf', 'topic.highest_post_number'),
-    composeChanged: (function() {
-      var composerController;
-      composerController = Discourse.get('router.composerController');
-      composerController.clearState();
-      return composerController.set('topic', this.get('topic'));
-    }).observes('composer'),
-    /* This view is being removed. Shut down operations
-    */
+    ratio = this.get('progressPosition') / this.get('topic.highest_post_number');
+    totalWidth = $topicProgress.width();
+    progressWidth = ratio * totalWidth;
+    bg = $topicProgress.find('.bg');
+    bg.stop(true, true);
+    currentWidth = bg.width()
 
-    willDestroyElement: function() {
-      var _ref;
-      this.unbindScrolling();
-      this.get('controller').unsubscribe();
-      if (_ref = this.get('screenTrack')) {
-        _ref.stop();
-      }
-      this.set('screenTrack', null);
-      jQuery(window).unbind('scroll.discourse-on-scroll');
-      jQuery(document).unbind('touchmove.discourse-on-scroll');
-      jQuery(window).unbind('resize.discourse-on-scroll');
-      return this.resetExamineDockCache();
-    },
-    didInsertElement: function(e) {
-      var eyeline, onScroll, screenTrack,
-        _this = this;
-      onScroll = Discourse.debounce((function() {
-        return _this.onScroll();
-      }), 10);
-      jQuery(window).bind('scroll.discourse-on-scroll', onScroll);
-      jQuery(document).bind('touchmove.discourse-on-scroll', onScroll);
-      jQuery(window).bind('resize.discourse-on-scroll', onScroll);
-      this.bindScrolling();
-      this.get('controller').subscribe();
-      // Insert our screen tracker
-      screenTrack = Discourse.ScreenTrack.create({
-        topic_id: this.get('topic.id')
-      });
-      screenTrack.start();
-      this.set('screenTrack', screenTrack);
-      // Track the user's eyeline
-      eyeline = new Discourse.Eyeline('.topic-post');
-      eyeline.on('saw', function(e) {
-        return _this.postSeen(e.detail);
-      });
-      eyeline.on('sawBottom', function(e) {
-        return _this.nextPage(e.detail);
-      });
-      eyeline.on('sawTop', function(e) {
-        return _this.prevPage(e.detail);
-      });
-      this.set('eyeline', eyeline);
-      this.$().on('mouseup.discourse-redirect', '.cooked a, a.track-link', function(e) {
-        return Discourse.ClickTrack.trackClick(e);
-      });
-      return this.onScroll();
-    },
+    if (currentWidth === totalWidth) {
+      bg.width(currentWidth - 1);
+    }
 
-    // Triggered from the post view all posts are rendered
-    postsRendered: function(postDiv, post) {
-      var $lastPost, $window,
-        _this = this;
-      $window = jQuery(window);
-      $lastPost = jQuery('.row:last');
-      // we consider stuff at the end of the list as read, right away (if it is visible)
-      if ($window.height() + $window.scrollTop() >= $lastPost.offset().top + $lastPost.height()) {
-        return this.examineRead();
-      } else {
-        // last is not in view, so only examine in 2 seconds
-        return Em.run.later(function() {
-          return _this.examineRead();
-        }, 2000);
-      }
-    },
-    resetRead: function(e) {
-      var _this = this;
-      this.get('screenTrack').cancel();
-      this.set('screenTrack', null);
-      this.get('controller').unsubscribe();
-      return this.get('topic').resetRead(function() {
-        _this.set('controller.message', "Your read position has been reset.");
-        return _this.set('controller.loaded', false);
-      });
-    },
+    if (progressWidth === totalWidth) {
+      bg.css("border-right-width", "0px");
+    } else {
+      bg.css("border-right-width", "1px");
+    }
 
-    // Called for every post seen
-    postSeen: function($post) {
-      var post, postView, _ref;
-      this.set('postNumberSeen', null);
-      postView = Ember.View.views[$post.prop('id')];
-      if (postView) {
-        post = postView.get('post');
-        this.set('postNumberSeen', post.get('post_number'));
-        if (post.get('post_number') > (this.get('topic.last_read_post_number') || 0)) {
-          this.set('topic.last_read_post_number', post.get('post_number'));
-        }
-        if (!post.get('read')) {
-          post.set('read', true);
-          return (_ref = this.get('screenTrack')) ? _ref.guessedSeen(post.get('post_number')) : void 0;
-        }
-      }
-    },
-    observeFirstPostLoaded: (function() {
-      var loaded, old, posts;
-      posts = this.get('topic.posts');
-      // TODO topic.posts stores non ember objects in it for a period of time, this is bad
-      loaded = posts && posts[0] && posts[0].post_number === 1;
+    if (currentWidth === 0) {
+      bg.width(progressWidth);
+    } else {
+      bg.animate({ width: progressWidth }, 400);
+    }
+  }).observes('progressPosition', 'topic.highest_post_number', 'topic.loaded'),
 
-      // I avoided a computed property cause I did not want to set it, over and over again
-      old = this.get('firstPostLoaded');
-      if (loaded) {
-        if (old !== true) {
-          return this.set('firstPostLoaded', true);
-        }
-      } else {
-        if (old !== false) {
-          return this.set('firstPostLoaded', false);
-        }
-      }
-    }).observes('topic.posts.@each'),
+  updateTitle: (function() {
+    var title;
+    title = this.get('topic.title');
+    if (title) return Discourse.set('title', title);
+  }).observes('topic.loaded', 'topic.title'),
 
-    // Load previous posts if there are some
-    prevPage: function($post) {
-      var opts, post, postView,
-        _this = this;
-      postView = Ember.View.views[$post.prop('id')];
-      if (!postView) {
-        return;
+  newPostsPresent: (function() {
+    if (this.get('topic.highest_post_number')) {
+      this.updateBar();
+      this.examineRead();
+    }
+  }).observes('topic.highest_post_number'),
+
+  currentPostChanged: (function() {
+    var current, postUrl, topic;
+    current = this.get('controller.currentPost');
+    topic = this.get('topic');
+    if (!(current && topic)) return;
+    if (current > (this.get('maxPost') || 0)) {
+      this.set('maxPost', current);
+    }
+    postUrl = topic.get('url');
+    if (current > 1) {
+      postUrl += "/" + current;
+    } else {
+      if (this.get('controller.bestOf')) {
+        postUrl += "/best_of";
       }
+    }
+    Discourse.replaceState(postUrl);
+
+    // Show appropriate jump tools
+    if (current === 1) {
+      $('#jump-top').attr('disabled', true);
+    } else {
+      $('#jump-top').attr('disabled', false);
+    }
+
+    if (current === this.get('topic.highest_post_number')) {
+      $('#jump-bottom').attr('disabled', true);
+    } else {
+      $('#jump-bottom').attr('disabled', false);
+    }
+  }).observes('controller.currentPost', 'controller.bestOf', 'topic.highest_post_number'),
+
+  composeChanged: (function() {
+    var composerController = Discourse.get('router.composerController');
+    composerController.clearState();
+    return composerController.set('topic', this.get('topic'));
+  }).observes('composer'),
+
+  // This view is being removed. Shut down operations
+  willDestroyElement: function() {
+    var _ref;
+    this.unbindScrolling();
+    this.get('controller').unsubscribe();
+    if (_ref = this.get('screenTrack')) {
+      _ref.stop();
+    }
+    this.set('screenTrack', null);
+    $(window).unbind('scroll.discourse-on-scroll');
+    $(document).unbind('touchmove.discourse-on-scroll');
+    $(window).unbind('resize.discourse-on-scroll');
+    return this.resetExamineDockCache();
+  },
+
+  didInsertElement: function(e) {
+    var eyeline, onScroll, screenTrack,
+      _this = this;
+    onScroll = Discourse.debounce((function() {
+      return _this.onScroll();
+    }), 10);
+    $(window).bind('scroll.discourse-on-scroll', onScroll);
+    $(document).bind('touchmove.discourse-on-scroll', onScroll);
+    $(window).bind('resize.discourse-on-scroll', onScroll);
+    this.bindScrolling();
+    this.get('controller').subscribe();
+
+    // Insert our screen tracker
+    screenTrack = Discourse.ScreenTrack.create({ topic_id: this.get('topic.id') });
+    screenTrack.start();
+    this.set('screenTrack', screenTrack);
+
+    // Track the user's eyeline
+    eyeline = new Discourse.Eyeline('.topic-post');
+    eyeline.on('saw', function(e) { return _this.postSeen(e.detail); });
+    eyeline.on('sawBottom', function(e) { _this.nextPage(e.detail); });
+    eyeline.on('sawTop', function(e) { _this.prevPage(e.detail); });
+    this.set('eyeline', eyeline);
+    this.$().on('mouseup.discourse-redirect', '.cooked a, a.track-link', function(e) {
+      return Discourse.ClickTrack.trackClick(e);
+    });
+
+    return this.onScroll();
+  },
+
+  // Triggered from the post view all posts are rendered
+  postsRendered: function(postDiv, post) {
+    var $lastPost, $window,
+      _this = this;
+    $window = $(window);
+    $lastPost = $('.row:last');
+    // we consider stuff at the end of the list as read, right away (if it is visible)
+    if ($window.height() + $window.scrollTop() >= $lastPost.offset().top + $lastPost.height()) {
+      this.examineRead();
+    } else {
+      // last is not in view, so only examine in 2 seconds
+      Em.run.later(function() { _this.examineRead(); }, 2000);
+    }
+  },
+
+  resetRead: function(e) {
+    var _this = this;
+    this.get('screenTrack').cancel();
+    this.set('screenTrack', null);
+    this.get('controller').unsubscribe();
+    this.get('topic').resetRead(function() {
+      _this.set('controller.message', "Your read position has been reset.");
+      _this.set('controller.loaded', false);
+    });
+  },
+
+  // Called for every post seen
+  postSeen: function($post) {
+    var post, postView, _ref;
+    this.set('postNumberSeen', null);
+    postView = Ember.View.views[$post.prop('id')];
+    if (postView) {
       post = postView.get('post');
-      if (!post) {
-        return;
+      this.set('postNumberSeen', post.get('post_number'));
+      if (post.get('post_number') > (this.get('topic.last_read_post_number') || 0)) {
+        this.set('topic.last_read_post_number', post.get('post_number'));
       }
-      /* We don't load upwards from the first page
-      */
-
-      if (post.post_number === 1) {
-        return;
+      if (!post.get('read')) {
+        post.set('read', true);
+        return (_ref = this.get('screenTrack')) ? _ref.guessedSeen(post.get('post_number')) : void 0;
       }
-      /* double check
-      */
+    }
+  },
 
-      if (this.topic && this.topic.posts && this.topic.posts.length > 0 && this.topic.posts.first().post_number !== post.post_number) {
-        return;
+  observeFirstPostLoaded: (function() {
+    var loaded, old, posts;
+    posts = this.get('topic.posts');
+    // TODO topic.posts stores non ember objects in it for a period of time, this is bad
+    loaded = posts && posts[0] && posts[0].post_number === 1;
+
+    // I avoided a computed property cause I did not want to set it, over and over again
+    old = this.get('firstPostLoaded');
+    if (loaded) {
+      if (old !== true) {
+        this.set('firstPostLoaded', true);
       }
-      /* half mutex
-      */
-
-      if (this.loading) {
-        return;
+    } else {
+      if (old !== false) {
+        this.set('firstPostLoaded', false);
       }
-      this.set('loading', true);
-      this.set('loadingAbove', true);
-      opts = jQuery.extend({
-        postsBefore: post.get('post_number')
-      }, this.get('controller.postFilters'));
-      return Discourse.Topic.find(this.get('topic.id'), opts).then(function(result) {
-        var lastPostNum, posts;
-        posts = _this.get('topic.posts');
-        /* Add a scrollTo record to the last post inserted to the DOM
-        */
+    }
+  }).observes('topic.posts.@each'),
 
-        lastPostNum = result.posts.first().post_number;
-        result.posts.each(function(p) {
-          var newPost;
-          newPost = Discourse.Post.create(p, _this.get('topic'));
-          if (p.post_number === lastPostNum) {
-            newPost.set('scrollTo', {
-              top: jQuery(window).scrollTop(),
-              height: jQuery(document).height()
-            });
-          }
-          return posts.unshiftObject(newPost);
-        });
-        _this.set('loading', false);
-        return _this.set('loadingAbove', false);
-      });
-    },
-    fullyLoaded: (function() {
-      return this.seenBottom || this.topic.at_bottom;
-    }).property('topic.at_bottom', 'seenBottom'),
-    /* Load new posts if there are some
-    */
+  // Load previous posts if there are some
+  prevPage: function($post) {
+    var opts, post, postView,
+      _this = this;
+    postView = Ember.View.views[$post.prop('id')];
+    if (!postView) return;
+    post = postView.get('post');
+    if (!post) return;
 
-    nextPage: function($post) {
-      var post, postView;
-      if (this.loading || this.seenBottom) {
-        return;
-      }
-      postView = Ember.View.views[$post.prop('id')];
-      if (!postView) {
-        return;
-      }
-      post = postView.get('post');
-      return this.loadMore(post);
-    },
-    
-    postCountChanged: (function() {
-      this.set('seenBottom', false);
-      var eyeline = this.get('eyeline');
-      if (eyeline)
-        eyeline.update()
-    }).observes('topic.highest_post_number'),
+    // We don't load upwards from the first page
+    if (post.post_number === 1) return;
 
-    loadMore: function(post) {
-      var opts, postNumberSeen, _ref,
-        _this = this;
-      if (this.loading || this.seenBottom) {
-        return;
-      }
-      /* Don't load if we know we're at the bottom
-      */
+    // double check
+    if (this.topic && this.topic.posts && this.topic.posts.length > 0 && this.topic.posts.first().post_number !== post.post_number) return;
 
-      if (this.get('topic.highest_post_number') === post.get('post_number')) {
-        if (_ref = this.get('eyeline')) {
-          _ref.flushRest();
-        }
-        /* Update our current post to the last number we saw
-        */
+    // half mutex
+    if (this.loading) return;
+    this.set('loading', true);
+    this.set('loadingAbove', true);
+    opts = jQuery.extend({
+      postsBefore: post.get('post_number')
+    }, this.get('controller.postFilters'));
 
-        if (postNumberSeen = this.get('postNumberSeen')) {
-          this.set('controller.currentPost', postNumberSeen);
-        }
-        return;
-      }
-      /* Don't double load ever
-      */
+    return Discourse.Topic.find(this.get('topic.id'), opts).then(function(result) {
+      var lastPostNum, posts;
+      posts = _this.get('topic.posts');
 
-      if (this.topic.posts.last().post_number !== post.post_number) {
-        return;
-      }
-      this.set('loadingBelow', true);
-      this.set('loading', true);
-      opts = jQuery.extend({
-        postsAfter: post.get('post_number')
-      }, this.get('controller.postFilters'));
-      return Discourse.Topic.find(this.get('topic.id'), opts).then(function(result) {
-        var suggested;
-        if (result.at_bottom || result.posts.length === 0) {
-          _this.set('seenBottom', 'true');
-        }
-        _this.get('topic').pushPosts(result.posts.map(function(p) {
-          return Discourse.Post.create(p, _this.get('topic'));
-        }));
-        if (result.suggested_topics) {
-          suggested = Em.A();
-          result.suggested_topics.each(function(st) {
-            return suggested.pushObject(Discourse.Topic.create(st));
+      // Add a scrollTo record to the last post inserted to the DOM
+      lastPostNum = result.posts.first().post_number;
+      result.posts.each(function(p) {
+        var newPost;
+        newPost = Discourse.Post.create(p, _this.get('topic'));
+        if (p.post_number === lastPostNum) {
+          newPost.set('scrollTo', {
+            top: $(window).scrollTop(),
+            height: $(document).height()
           });
-          _this.set('topic.suggested_topics', suggested);
         }
-        _this.set('loadingBelow', false);
-        return _this.set('loading', false);
+        return posts.unshiftObject(newPost);
       });
-    },
-    /* Examine which posts are on the screen and mark them as read. Also figure out if we
-    */
+      _this.set('loading', false);
+      return _this.set('loadingAbove', false);
+    });
+  },
 
-    /* need to load more posts.
-    */
+  fullyLoaded: (function() {
+    return this.seenBottom || this.topic.at_bottom;
+  }).property('topic.at_bottom', 'seenBottom'),
 
-    examineRead: function() {
-      /* Track posts time on screen
-      */
+  // Load new posts if there are some
+  nextPage: function($post) {
+    var post, postView;
+    if (this.loading || this.seenBottom) return;
+    postView = Ember.View.views[$post.prop('id')];
+    if (!postView) return;
+    post = postView.get('post');
+    return this.loadMore(post);
+  },
 
-      var postNumberSeen, _ref, _ref1;
-      if (_ref = this.get('screenTrack')) {
-        _ref.scrolled();
+  postCountChanged: (function() {
+    this.set('seenBottom', false);
+    var eyeline = this.get('eyeline');
+    if (eyeline) eyeline.update()
+  }).observes('topic.highest_post_number'),
+
+  loadMore: function(post) {
+    var opts, postNumberSeen, _ref,
+      _this = this;
+    if (this.loading || this.seenBottom) return;
+
+    // Don't load if we know we're at the bottom
+    if (this.get('topic.highest_post_number') === post.get('post_number')) {
+      if (_ref = this.get('eyeline')) {
+        _ref.flushRest();
       }
-      /* Update what we can see
-      */
-
-      if (_ref1 = this.get('eyeline')) {
-        _ref1.update();
-      }
-      /* Update our current post to the last number we saw
-      */
 
+      // Update our current post to the last number we saw
       if (postNumberSeen = this.get('postNumberSeen')) {
-        return this.set('controller.currentPost', postNumberSeen);
+        this.set('controller.currentPost', postNumberSeen);
       }
-    },
-    cancelEdit: function() {
-      return this.set('editingTopic', false);
-    },
-    finishedEdit: function() {
-      var new_val, topic;
-      if (this.get('editingTopic')) {
-        topic = this.get('topic');
-        new_val = jQuery('#edit-title').val();
-        topic.set('title', new_val);
-        topic.set('fancy_title', new_val);
-        topic.save();
-        return this.set('editingTopic', false);
+      return;
+    }
+
+    // Don't double load ever
+    if (this.topic.posts.last().post_number !== post.post_number) return;
+    this.set('loadingBelow', true);
+    this.set('loading', true);
+    opts = jQuery.extend({
+      postsAfter: post.get('post_number')
+    }, this.get('controller.postFilters'));
+    return Discourse.Topic.find(this.get('topic.id'), opts).then(function(result) {
+      var suggested;
+      if (result.at_bottom || result.posts.length === 0) {
+        _this.set('seenBottom', 'true');
       }
-    },
-    editTopic: function() {
-      if (!this.get('topic.can_edit')) {
-        return false;
+      _this.get('topic').pushPosts(result.posts.map(function(p) {
+        return Discourse.Post.create(p, _this.get('topic'));
+      }));
+      if (result.suggested_topics) {
+        suggested = Em.A();
+        result.suggested_topics.each(function(st) {
+          return suggested.pushObject(Discourse.Topic.create(st));
+        });
+        _this.set('topic.suggested_topics', suggested);
       }
-      this.set('editingTopic', true);
-      return false;
-    },
-    showFavoriteButton: (function() {
-      return Discourse.currentUser && !this.get('topic.isPrivateMessage');
-    }).property('topic.isPrivateMessage'),
-    resetExamineDockCache: function() {
-      this.docAt = null;
-      this.dockedTitle = false;
-      this.dockedCounter = false;
-    },
-    detectDockPosition: function() {
-      var current, goingUp, i, increment, offset, post, postView, rows, winHeight, winOffset;
-      rows = jQuery(".topic-post");
-      if (rows.length === 0) {
-        return;
+      _this.set('loadingBelow', false);
+      return _this.set('loading', false);
+    });
+  },
+
+  // Examine which posts are on the screen and mark them as read. Also figure out if we
+  // need to load more posts.
+  examineRead: function() {
+    // Track posts time on screen
+    var postNumberSeen, _ref, _ref1;
+    if (_ref = this.get('screenTrack')) {
+      _ref.scrolled();
+    }
+
+    // Update what we can see
+    if (_ref1 = this.get('eyeline')) {
+      _ref1.update();
+    }
+
+    // Update our current post to the last number we saw
+    if (postNumberSeen = this.get('postNumberSeen')) {
+      this.set('controller.currentPost', postNumberSeen);
+    }
+  },
+
+  cancelEdit: function() {
+    this.set('editingTopic', false);
+  },
+
+  finishedEdit: function() {
+    var new_val, topic;
+    if (this.get('editingTopic')) {
+      topic = this.get('topic');
+      new_val = $('#edit-title').val();
+      topic.set('title', new_val);
+      topic.set('fancy_title', new_val);
+      topic.save();
+      this.set('editingTopic', false);
+    }
+  },
+
+  editTopic: function() {
+    if (!this.get('topic.can_edit')) return false;
+    this.set('editingTopic', true);
+    return false;
+  },
+
+  showFavoriteButton: (function() {
+    return Discourse.currentUser && !this.get('topic.isPrivateMessage');
+  }).property('topic.isPrivateMessage'),
+
+  resetExamineDockCache: function() {
+    this.docAt = null;
+    this.dockedTitle = false;
+    this.dockedCounter = false;
+  },
+
+  detectDockPosition: function() {
+    var current, goingUp, i, increment, offset, post, postView, rows, winHeight, winOffset;
+    rows = $(".topic-post");
+    if (rows.length === 0) return;
+    i = parseInt(rows.length / 2, 10);
+    increment = parseInt(rows.length / 4, 10);
+    goingUp = undefined;
+    winOffset = window.pageYOffset || $('html').scrollTop();
+    winHeight = window.innerHeight || $(window).height();
+    while (true) {
+      if (i === 0 || (i >= rows.length - 1)) {
+        break;
       }
-      i = parseInt(rows.length / 2, 10);
-      increment = parseInt(rows.length / 4, 10);
-      goingUp = undefined;
-      winOffset = window.pageYOffset || jQuery('html').scrollTop();
-      winHeight = window.innerHeight || jQuery(window).height();
-      while (true) {
-        if (i === 0 || (i >= rows.length - 1)) {
+      current = $(rows[i]);
+      offset = current.offset();
+      if (offset.top - winHeight < winOffset) {
+        if (offset.top + current.outerHeight() - window.innerHeight > winOffset) {
+          break;
+        } else {
+          i = i + increment;
+          if (goingUp !== undefined && increment === 1 && !goingUp) {
+            break;
+          }
+          goingUp = true;
+        }
+      } else {
+        i = i - increment;
+        if (goingUp !== undefined && increment === 1 && goingUp) {
           break;
         }
-        current = jQuery(rows[i]);
-        offset = current.offset();
-        if (offset.top - winHeight < winOffset) {
-          if (offset.top + current.outerHeight() - window.innerHeight > winOffset) {
-            break;
-          } else {
-            i = i + increment;
-            if (goingUp !== undefined && increment === 1 && !goingUp) {
-              break;
-            }
-            goingUp = true;
-          }
-        } else {
-          i = i - increment;
-          if (goingUp !== undefined && increment === 1 && goingUp) {
-            break;
-          }
-          goingUp = false;
-        }
-        if (increment > 1) {
-          increment = parseInt(increment / 2, 10);
-          goingUp = undefined;
-        }
-        if (increment === 0) {
-          increment = 1;
-          goingUp = undefined;
-        }
+        goingUp = false;
       }
-      postView = Ember.View.views[rows[i].id];
-      if (!postView) {
-        return;
+      if (increment > 1) {
+        increment = parseInt(increment / 2, 10);
+        goingUp = undefined;
       }
-      post = postView.get('post');
-      if (!post) {
-        return;
+      if (increment === 0) {
+        increment = 1;
+        goingUp = undefined;
       }
-      this.set('progressPosition', post.get('post_number'));
-    },
-    ensureDockIsTestedOnChange: (function() {
-      // this is subtle, firstPostLoaded will trigger ember to render the view containing #topic-title
-      //  onScroll needs do know about it to be able to make a decision about the dock
-      return Em.run.next(this, this.onScroll);
-    }).observes('firstPostLoaded'),
-    onScroll: function() {
-      var $lastPost, firstLoaded, lastPostOffset, offset, title;
-      this.detectDockPosition();
-      offset = window.pageYOffset || jQuery('html').scrollTop();
-      firstLoaded = this.get('firstPostLoaded');
-      if (!this.docAt) {
-        title = jQuery('#topic-title');
-        if (title && title.length === 1) {
-          this.docAt = title.offset().top;
-        }
-      }
-      if (this.docAt) {
-        this.set('controller.showExtraHeaderInfo', offset >= this.docAt || !firstLoaded);
-      } else {
-        this.set('controller.showExtraHeaderInfo', !firstLoaded);
-      }
-
-      // there is a whole bunch of caching we could add here
-      $lastPost = jQuery('.last-post');
-      lastPostOffset = $lastPost.offset();
-      if (!lastPostOffset) {
-        return;
-      }
-      if (offset >= (lastPostOffset.top + $lastPost.height()) - jQuery(window).height()) {
-        if (!this.dockedCounter) {
-          jQuery('#topic-progress-wrapper').addClass('docked');
-          this.dockedCounter = true;
-        }
-      } else {
-        if (this.dockedCounter) {
-          jQuery('#topic-progress-wrapper').removeClass('docked');
-          this.dockedCounter = false;
-        }
-      }
-    },
-    browseMoreMessage: (function() {
-      var category, opts;
-      opts = {
-        popularLink: "" + (Em.String.i18n("topic.view_popular_topics")) + ""
-      };
-      if (category = this.get('controller.content.category')) {
-        opts.catLink = Discourse.Utilities.categoryLink(category);
-        return Ember.String.i18n("topic.read_more_in_category", opts);
-      } else {
-        opts.catLink = "" + (Em.String.i18n("topic.browse_all_categories")) + "";
-        return Ember.String.i18n("topic.read_more", opts);
-      }
-    }).property(),
-    /* The window has been scrolled
-    */
-
-    scrolled: function(e) {
-      return this.examineRead();
     }
-  });
+    postView = Ember.View.views[rows[i].id];
+    if (!postView) return;
+    post = postView.get('post');
+    if (!post) return;
+    this.set('progressPosition', post.get('post_number'));
+  },
 
-  window.Discourse.TopicView.reopenClass({
-    /* Scroll to a given post, if in the DOM. Returns whether it was in the DOM or not.
-    */
+  ensureDockIsTestedOnChange: (function() {
+    // this is subtle, firstPostLoaded will trigger ember to render the view containing #topic-title
+    //  onScroll needs do know about it to be able to make a decision about the dock
+    Em.run.next(this, this.onScroll);
+  }).observes('firstPostLoaded'),
 
-    scrollTo: function(topicId, postNumber, callback) {
-      /* Make sure we're looking at the topic we want to scroll to
-      */
-
-      var existing;
-      if (parseInt(topicId, 10) !== parseInt(jQuery('#topic').data('topic-id'), 10)) {
-        return false;
+  onScroll: function() {
+    var $lastPost, firstLoaded, lastPostOffset, offset, title;
+    this.detectDockPosition();
+    offset = window.pageYOffset || $('html').scrollTop();
+    firstLoaded = this.get('firstPostLoaded');
+    if (!this.docAt) {
+      title = $('#topic-title');
+      if (title && title.length === 1) {
+        this.docAt = title.offset().top;
       }
-      existing = jQuery("#post_" + postNumber);
-      if (existing.length) {
-        if (postNumber === 1) {
-          jQuery('html, body').scrollTop(0);
-        } else {
-          jQuery('html, body').scrollTop(existing.offset().top - 55);
-        }
-        return true;
-      }
-      return false;
     }
-  });
+    if (this.docAt) {
+      this.set('controller.showExtraHeaderInfo', offset >= this.docAt || !firstLoaded);
+    } else {
+      this.set('controller.showExtraHeaderInfo', !firstLoaded);
+    }
 
-}).call(this);
+    // there is a whole bunch of caching we could add here
+    $lastPost = $('.last-post');
+    lastPostOffset = $lastPost.offset();
+    if (!lastPostOffset) return;
+
+    if (offset >= (lastPostOffset.top + $lastPost.height()) - $(window).height()) {
+      if (!this.dockedCounter) {
+        $('#topic-progress-wrapper').addClass('docked');
+        this.dockedCounter = true;
+      }
+    } else {
+      if (this.dockedCounter) {
+        $('#topic-progress-wrapper').removeClass('docked');
+        this.dockedCounter = false;
+      }
+    }
+  },
+
+  browseMoreMessage: (function() {
+    var category, opts;
+    opts = {
+      popularLink: "" + (Em.String.i18n("topic.view_popular_topics")) + ""
+    };
+    if (category = this.get('controller.content.category')) {
+      opts.catLink = Discourse.Utilities.categoryLink(category);
+      return Ember.String.i18n("topic.read_more_in_category", opts);
+    } else {
+      opts.catLink = "" + (Em.String.i18n("topic.browse_all_categories")) + "";
+      return Ember.String.i18n("topic.read_more", opts);
+    }
+  }).property(),
+
+  // The window has been scrolled
+  scrolled: function(e) {
+    return this.examineRead();
+  }
+});
+
+window.Discourse.TopicView.reopenClass({
+
+  // Scroll to a given post, if in the DOM. Returns whether it was in the DOM or not.
+  scrollTo: function(topicId, postNumber, callback) {
+    // Make sure we're looking at the topic we want to scroll to
+    var existing;
+    if (parseInt(topicId, 10) !== parseInt($('#topic').data('topic-id'), 10)) return false;
+    existing = $("#post_" + postNumber);
+    if (existing.length) {
+      if (postNumber === 1) {
+        $('html, body').scrollTop(0);
+      } else {
+        $('html, body').scrollTop(existing.offset().top - 55);
+      }
+      return true;
+    }
+    return false;
+  }
+});
diff --git a/app/assets/javascripts/discourse/views/user/activity_filter_view.js b/app/assets/javascripts/discourse/views/user/activity_filter_view.js
index 0bc19f99a9c..b21c0ba184e 100644
--- a/app/assets/javascripts/discourse/views/user/activity_filter_view.js
+++ b/app/assets/javascripts/discourse/views/user/activity_filter_view.js
@@ -1,31 +1,40 @@
-(function() {
+/**
+  This view handles rendering of an activity in a user's stream
 
-  window.Discourse.ActivityFilterView = Discourse.View.extend({
-    tagName: 'li',
-    classNameBindings: ['active'],
-    active: (function() {
-      var content;
-      if (content = this.get('content')) {
-        return parseInt(this.get('controller.content.streamFilter'), 10) === parseInt(Em.get(content, 'action_type'), 10);
-      } else {
-        return this.blank('controller.content.streamFilter');
-      }
-    }).property('controller.content.streamFilter', 'content.action_type'),
-    render: function(buffer) {
-      var content, count, description;
-      if (content = this.get('content')) {
-        count = Em.get(content, 'count');
-        description = Em.get(content, 'description');
-      } else {
-        count = this.get('count');
-        description = Em.String.i18n("user.filters.all");
-      }
-      return buffer.push("" + description + " (" + count + ")");
-    },
-    click: function() {
-      this.get('controller.content').filterStream(this.get('content.action_type'));
-      return false;
+  @class ActivityFilterView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.ActivityFilterView = Discourse.View.extend({
+  tagName: 'li',
+  classNameBindings: ['active'],
+
+  active: (function() {
+    var content;
+    if (content = this.get('content')) {
+      return parseInt(this.get('controller.content.streamFilter'), 10) === parseInt(Em.get(content, 'action_type'), 10);
+    } else {
+      return this.blank('controller.content.streamFilter');
     }
-  });
+  }).property('controller.content.streamFilter', 'content.action_type'),
+
+  render: function(buffer) {
+    var content, count, description;
+    if (content = this.get('content')) {
+      count = Em.get(content, 'count');
+      description = Em.get(content, 'description');
+    } else {
+      count = this.get('count');
+      description = Em.String.i18n("user.filters.all");
+    }
+    return buffer.push("" + description + " (" + count + ")");
+  },
+
+  click: function() {
+    this.get('controller.content').filterStream(this.get('content.action_type'));
+    return false;
+  }
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/user/preferences_email_view.js b/app/assets/javascripts/discourse/views/user/preferences_email_view.js
index a37a4f02c95..8f90c3a4551 100644
--- a/app/assets/javascripts/discourse/views/user/preferences_email_view.js
+++ b/app/assets/javascripts/discourse/views/user/preferences_email_view.js
@@ -1,11 +1,17 @@
-(function() {
+/**
+  This view handles rendering of a user's email preferences
+
+  @class PreferencesEmailView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+window.Discourse.PreferencesEmailView = Discourse.View.extend({
+  templateName: 'user/email',
+  classNames: ['user-preferences'],
+  didInsertElement: function() {
+    return $('#change_email').focus();
+  }
+});
 
-  window.Discourse.PreferencesEmailView = Discourse.View.extend({
-    templateName: 'user/email',
-    classNames: ['user-preferences'],
-    didInsertElement: function() {
-      return jQuery('#change_email').focus();
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/user/preferences_username_view.js b/app/assets/javascripts/discourse/views/user/preferences_username_view.js
index 6b346f61f96..c553fa8c09f 100644
--- a/app/assets/javascripts/discourse/views/user/preferences_username_view.js
+++ b/app/assets/javascripts/discourse/views/user/preferences_username_view.js
@@ -1,21 +1,30 @@
-(function() {
+/**
+  This view handles rendering of a user's username preferences
 
-  window.Discourse.PreferencesUsernameView = Discourse.View.extend({
-    templateName: 'user/username',
-    classNames: ['user-preferences'],
-    didInsertElement: function() {
-      return jQuery('#change_username').focus();
-    },
-    keyDown: function(e) {
-      if (e.keyCode === 13) {
-        if (!this.get('controller').get('saveDisabled')) {
-          return this.get('controller').changeUsername();
-        } else {
-          e.preventDefault();
-          return false;
-        }
+  @class PreferencesUsernameView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.PreferencesUsernameView = Discourse.View.extend({
+  templateName: 'user/username',
+  classNames: ['user-preferences'],
+
+  didInsertElement: function() {
+    return $('#change_username').focus();
+  },
+
+  keyDown: function(e) {
+    if (e.keyCode === 13) {
+      if (!this.get('controller').get('saveDisabled')) {
+        return this.get('controller').changeUsername();
+      } else {
+        e.preventDefault();
+        return false;
       }
     }
-  });
+  }
+
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/user/preferences_view.js b/app/assets/javascripts/discourse/views/user/preferences_view.js
index def30f381a0..1652af24c06 100644
--- a/app/assets/javascripts/discourse/views/user/preferences_view.js
+++ b/app/assets/javascripts/discourse/views/user/preferences_view.js
@@ -1,8 +1,14 @@
-(function() {
+/**
+  This view handles rendering of a user's preferences
+
+  @class PreferencesView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.PreferencesView = Discourse.View.extend({
+  templateName: 'user/preferences',
+  classNames: ['user-preferences']
+});
 
-  window.Discourse.PreferencesView = Discourse.View.extend({
-    templateName: 'user/preferences',
-    classNames: ['user-preferences']
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/user/user_activity_view.js b/app/assets/javascripts/discourse/views/user/user_activity_view.js
index d36f0279686..38366d8ef84 100644
--- a/app/assets/javascripts/discourse/views/user/user_activity_view.js
+++ b/app/assets/javascripts/discourse/views/user/user_activity_view.js
@@ -1,12 +1,20 @@
-(function() {
+/**
+  This view handles rendering of a user's activity stream
+
+  @class UserActivityView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.UserActivityView = Discourse.View.extend({
+  templateName: 'user/activity',
+  currentUserBinding: 'Discourse.currentUser',
+  userBinding: 'controller.content',
+
+  didInsertElement: function() {
+    window.scrollTo(0, 0);
+  }
+
+});
 
-  window.Discourse.UserActivityView = Discourse.View.extend({
-    templateName: 'user/activity',
-    currentUserBinding: 'Discourse.currentUser',
-    userBinding: 'controller.content',
-    didInsertElement: function() {
-      return window.scrollTo(0, 0);
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/user/user_invited_view.js b/app/assets/javascripts/discourse/views/user/user_invited_view.js
index 30988c99b11..37849ef0fc6 100644
--- a/app/assets/javascripts/discourse/views/user/user_invited_view.js
+++ b/app/assets/javascripts/discourse/views/user/user_invited_view.js
@@ -1,7 +1,13 @@
-(function() {
+/**
+  This view handles rendering of a user's invited list
+
+  @class UserInvitedView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.UserInvitedView = Discourse.View.extend({
+  templateName: 'user/invited'
+});
 
-  window.Discourse.UserInvitedView = Discourse.View.extend({
-    templateName: 'user/invited'
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/user/user_private_messages_view.js b/app/assets/javascripts/discourse/views/user/user_private_messages_view.js
index db30faee5b1..9290c4dcb11 100644
--- a/app/assets/javascripts/discourse/views/user/user_private_messages_view.js
+++ b/app/assets/javascripts/discourse/views/user/user_private_messages_view.js
@@ -1,21 +1,31 @@
-(function() {
+/**
+  This view handles rendering of a user's private messages
+
+  @class UserPrivateMessagesView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.UserPrivateMessagesView = Discourse.View.extend({
+  templateName: 'user/private_messages',
+
+  selectCurrent: function(evt) {
+    var t;
+    t = $(evt.currentTarget);
+    t.closest('.action-list').find('li').removeClass('active');
+    return t.closest('li').addClass('active');
+  },
+
+  inbox: function(evt) {
+    this.selectCurrent(evt);
+    return this.set('controller.filter', Discourse.UserAction.GOT_PRIVATE_MESSAGE);
+  },
+
+  sentMessages: function(evt) {
+    this.selectCurrent(evt);
+    return this.set('controller.filter', Discourse.UserAction.NEW_PRIVATE_MESSAGE);
+  }
+
+});
 
-  window.Discourse.UserPrivateMessagesView = Discourse.View.extend({
-    templateName: 'user/private_messages',
-    selectCurrent: function(evt) {
-      var t;
-      t = jQuery(evt.currentTarget);
-      t.closest('.action-list').find('li').removeClass('active');
-      return t.closest('li').addClass('active');
-    },
-    inbox: function(evt) {
-      this.selectCurrent(evt);
-      return this.set('controller.filter', Discourse.UserAction.GOT_PRIVATE_MESSAGE);
-    },
-    sentMessages: function(evt) {
-      this.selectCurrent(evt);
-      return this.set('controller.filter', Discourse.UserAction.NEW_PRIVATE_MESSAGE);
-    }
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/user/user_stream_view.js b/app/assets/javascripts/discourse/views/user/user_stream_view.js
index 19607ed4ca1..7169b588620 100644
--- a/app/assets/javascripts/discourse/views/user/user_stream_view.js
+++ b/app/assets/javascripts/discourse/views/user/user_stream_view.js
@@ -1,45 +1,56 @@
-(function() {
+/**
+  This view handles rendering of a user's stream
 
-  window.Discourse.UserStreamView = Discourse.View.extend(Discourse.Scrolling, {
-    templateName: 'user/stream',
-    currentUserBinding: 'Discourse.currentUser',
-    userBinding: 'controller.content',
-    scrolled: function(e) {
-      var $userStreamBottom, docViewBottom, docViewTop, position, windowHeight,
-        _this = this;
-      $userStreamBottom = jQuery('#user-stream-bottom');
-      if ($userStreamBottom.data('loading')) {
-        return;
-      }
-      if (!($userStreamBottom && (position = $userStreamBottom.position()))) {
-        return;
-      }
-      docViewTop = jQuery(window).scrollTop();
-      windowHeight = jQuery(window).height();
-      docViewBottom = docViewTop + windowHeight;
-      this.set('loading', true);
-      if (position.top < docViewBottom) {
-        $userStreamBottom.data('loading', true);
-        this.set('loading', true);
-        return this.get('controller.content').loadMoreUserActions(function() {
-          _this.set('loading', false);
-          return Em.run.next(function() {
-            return $userStreamBottom.data('loading', null);
-          });
-        });
-      }
-    },
-    willDestroyElement: function() {
-      Discourse.MessageBus.unsubscribe("/users/" + (this.get('user.username').toLowerCase()));
-      return this.unbindScrolling();
-    },
-    didInsertElement: function() {
-      var _this = this;
-      Discourse.MessageBus.subscribe("/users/" + (this.get('user.username').toLowerCase()), function(data) {
-        return _this.get('user').loadUserAction(data);
-      });
-      return this.bindScrolling();
+  @class UserStreamView
+  @extends Discourse.View
+  @namespace Discourse
+  @uses Discourse.Scrolling
+  @module Discourse
+**/
+Discourse.UserStreamView = Discourse.View.extend(Discourse.Scrolling, {
+  templateName: 'user/stream',
+  currentUserBinding: 'Discourse.currentUser',
+  userBinding: 'controller.content',
+
+  scrolled: function(e) {
+    var $userStreamBottom, docViewBottom, docViewTop, position, windowHeight,
+      _this = this;
+    $userStreamBottom = $('#user-stream-bottom');
+    if ($userStreamBottom.data('loading')) {
+      return;
     }
-  });
+    if (!($userStreamBottom && (position = $userStreamBottom.position()))) {
+      return;
+    }
+    docViewTop = $(window).scrollTop();
+    windowHeight = $(window).height();
+    docViewBottom = docViewTop + windowHeight;
+    this.set('loading', true);
+    if (position.top < docViewBottom) {
+      $userStreamBottom.data('loading', true);
+      this.set('loading', true);
+      return this.get('controller.content').loadMoreUserActions(function() {
+        _this.set('loading', false);
+        return Em.run.next(function() {
+          return $userStreamBottom.data('loading', null);
+        });
+      });
+    }
+  },
+
+  willDestroyElement: function() {
+    Discourse.MessageBus.unsubscribe("/users/" + (this.get('user.username').toLowerCase()));
+    this.unbindScrolling();
+  },
+
+  didInsertElement: function() {
+    var _this = this;
+    Discourse.MessageBus.subscribe("/users/" + (this.get('user.username').toLowerCase()), function(data) {
+      _this.get('user').loadUserAction(data);
+    });
+    this.bindScrolling();
+  }
+
+});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/user/user_view.js b/app/assets/javascripts/discourse/views/user/user_view.js
index 57a9aa7bbf9..fd76bb7bcdc 100644
--- a/app/assets/javascripts/discourse/views/user/user_view.js
+++ b/app/assets/javascripts/discourse/views/user/user_view.js
@@ -1,15 +1,23 @@
-(function() {
+/**
+  This view handles rendering of a user including the navigational menu
+
+  @class UserView
+  @extends Discourse.View
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.UserView = Discourse.View.extend({
+  templateName: 'user/user',
+  userBinding: 'controller.content',
+
+  updateTitle: function() {
+    var username;
+    username = this.get('user.username');
+    if (username) {
+      return Discourse.set('title', "" + (Em.String.i18n("user.profile")) + " - " + username);
+    }
+  }.observes('user.loaded', 'user.username')
+
+});
 
-  window.Discourse.UserView = Discourse.View.extend({
-    templateName: 'user/user',
-    userBinding: 'controller.content',
-    updateTitle: (function() {
-      var username;
-      username = this.get('user.username');
-      if (username) {
-        return Discourse.set('title', "" + (Em.String.i18n("user.profile")) + " - " + username);
-      }
-    }).observes('user.loaded', 'user.username')
-  });
 
-}).call(this);
diff --git a/app/assets/javascripts/discourse/views/view.js b/app/assets/javascripts/discourse/views/view.js
index c6af2afb1ee..aa796336b2f 100644
--- a/app/assets/javascripts/discourse/views/view.js
+++ b/app/assets/javascripts/discourse/views/view.js
@@ -1,5 +1,3 @@
-(function() {
-
   /**
     A base view that gives us common functionality, for example `present` and `blank`
 
@@ -8,9 +6,7 @@
     @uses Discourse.Presence
     @namespace Discourse
     @module Discourse
-  **/ 
-  window.Discourse.View = Ember.View.extend(Discourse.Presence, {
-    
-  });
+  **/
+  window.Discourse.View = Ember.View.extend(Discourse.Presence, {});
+
 
-}).call(this);
diff --git a/app/assets/javascripts/env.js b/app/assets/javascripts/env.js
index 1144b4a6fb2..6e4ded766f7 100644
--- a/app/assets/javascripts/env.js
+++ b/app/assets/javascripts/env.js
@@ -3,8 +3,6 @@
 */
 
 
-(function() {
-
   window.ENV = {
     CP_DEFAULT_CACHEABLE: true,
     VIEW_PRESERVES_CONTEXT: true,
@@ -15,4 +13,4 @@
 
   window.Discourse.SiteSettings = {};
 
-}).call(this);
+
diff --git a/app/assets/javascripts/pagedown_custom.js b/app/assets/javascripts/pagedown_custom.js
index 4ffe6dd05b4..e5a3bb7c6ef 100644
--- a/app/assets/javascripts/pagedown_custom.js
+++ b/app/assets/javascripts/pagedown_custom.js
@@ -1,5 +1,3 @@
-(function() {
-
   window.PagedownCustom = {
     insertButtons: [
       {
@@ -17,4 +15,4 @@
     ]
   };
 
-}).call(this);
+
diff --git a/app/assets/javascripts/preload_store.js b/app/assets/javascripts/preload_store.js
index 9d518ff4cbd..55422a674a2 100644
--- a/app/assets/javascripts/preload_store.js
+++ b/app/assets/javascripts/preload_store.js
@@ -1,56 +1,51 @@
-
 /* We can insert data into the PreloadStore when the document is loaded.
    The data can be accessed once by a key, after which it is removed */
-(function() {
-
-  window.PreloadStore = {
-    data: {},
-    store: function(key, value) {
-      this.data[key] = value;
-    },
-    /* To retrieve a key, you provide the key you want, plus a finder to
-       load it if the key cannot be found. Once the key is used once, it is
-       removed from the store. So, for example, you can't load a preloaded topic
-       more than once. */
-    get: function(key, finder) {
-      var promise, result;
-      promise = new RSVP.Promise();
-      if (this.data[key]) {
-        promise.resolve(this.data[key]);
-        delete this.data[key];
-      } else {
-        if (finder) {
-          result = finder();
-
-          // If the finder returns a promise, we support that too
-          if (result.then) {
-            result.then(function(result) {
-              return promise.resolve(result);
-            }, function(result) {
-              return promise.reject(result);
-            });
-          } else {
-            promise.resolve(result);
-          }
-        } else {
-          promise.resolve(void 0);
-        }
-      }
-      return promise;
-    },
-    /* Does the store contain a particular key? Does not delete, just returns
-       true or false. */
-    contains: function(key) {
-      return this.data[key] !== void 0;
-    },
-    /* If we are sure it's preloaded, we don't have to supply a finder. Just
-       returns undefined if it's not in the store. */
-    getStatic: function(key) {
-      var result;
-      result = this.data[key];
+PreloadStore = {
+  data: {},
+  store: function(key, value) {
+    this.data[key] = value;
+  },
+  /* To retrieve a key, you provide the key you want, plus a finder to
+     load it if the key cannot be found. Once the key is used once, it is
+     removed from the store. So, for example, you can't load a preloaded topic
+     more than once. */
+  get: function(key, finder) {
+    var promise, result;
+    promise = new RSVP.Promise();
+    if (this.data[key]) {
+      promise.resolve(this.data[key]);
       delete this.data[key];
-      return result;
-    }
-  };
+    } else {
+      if (finder) {
+        result = finder();
 
-}).call(this);
+        // If the finder returns a promise, we support that too
+        if (result.then) {
+          result.then(function(result) {
+            return promise.resolve(result);
+          }, function(result) {
+            return promise.reject(result);
+          });
+        } else {
+          promise.resolve(result);
+        }
+      } else {
+        promise.resolve(void 0);
+      }
+    }
+    return promise;
+  },
+  /* Does the store contain a particular key? Does not delete, just returns
+     true or false. */
+  contains: function(key) {
+    return this.data[key] !== void 0;
+  },
+  /* If we are sure it's preloaded, we don't have to supply a finder. Just
+     returns undefined if it's not in the store. */
+  getStatic: function(key) {
+    var result;
+    result = this.data[key];
+    delete this.data[key];
+    return result;
+  }
+};
diff --git a/app/assets/stylesheets/components/tooltips.css.scss b/app/assets/stylesheets/components/tooltips.css.scss
deleted file mode 100644
index 093e22739d4..00000000000
--- a/app/assets/stylesheets/components/tooltips.css.scss
+++ /dev/null
@@ -1,144 +0,0 @@
-@import "foundation/variables";
-@import "foundation/mixins";
-
-// --------------------------------------------------
-// Excerpts
-// --------------------------------------------------
-
-.excerpt-view {
-  display: none;
-  position: fixed;
-  z-index: 2000;
-  width: 500px;
-  border: 1px solid #b9b9b9;
-  padding: 10px;
-  background-color: $white;
-  @include border-radius-all(4px);
-  .contents {
-    padding: 0 15px 0 55px;
-    color: #262525;
-    font-size: 14px;
-  }
-  h1 {
-    font-size: 20px;
-    line-height: 1;
-    margin-bottom: 5px;
-  }
-  .image {
-    float: left;
-    overflow: hidden;
-    @include border-radius-all(4px);
-  }
-  .info {
-    color: #7f7f7f;
-    font-size: 11px;
-  }
-  .description {
-    margin: 5px 0;
-  }
-  .figs {
-    figure {
-      display: inline;
-      margin: 0 10px 0 0;
-      padding: 0;
-      font-weight: bold;
-    }
-    figcaption {
-      display: inline;
-      font-weight: normal;
-    }
-  }
-  .button-row {
-    margin-top: 5px;
-    text-align: right;
-  }
-  .close {
-    position: absolute;
-    top: 3px;
-    right: 5px;
-    color: #7f7f7f;
-    font-size: 12px;
-    line-height: 8px;
-  }
-  &.medium {
-    width: 430px;
-    .contents {
-      padding-left: 0;
-    }
-  }
-  &.small {
-    width: 300px;
-  }
-  &:before,
-  &:after {
-    position: absolute;
-    width: 0;
-    height: 0;
-    content: "";
-    border-style: solid;
-    border-color: transparent;
-    pointer-events: none;
-  }
-  &:before {
-    border-width: 10px;
-  }
-  &:after {
-    border-width: 9px;
-  }
-  &.top:before {
-    top: 100%;
-    left: 5%;
-    margin-left: -10px;
-    border-bottom-width: 0;
-    border-top-color: #b9b9b9;
-  }
-  &.top:after {
-    top: 100%;
-    left: 5%;
-    margin-left: -9px;
-    border-bottom-width: 0;
-    border-top-color: $white;
-  }
-  &.right:before {
-    right: 100%;
-    top: 20%;
-    margin-top: -10px;
-    border-left-width: 0;
-    border-right-color: #b9b9b9;
-  }
-  &.right:after {
-    right: 100%;
-    top: 20%;
-    margin-top: -9px;
-    border-left-width: 0;
-    border-right-color: $white;
-  }
-  &.bottom:before {
-    bottom: 100%;
-    left: 5%;
-    margin-left: -10px;
-    border-top-width: 0;
-    border-bottom-color: #b9b9b9;
-  }
-  &.bottom:after {
-    bottom: 100%;
-    left: 5%;
-    margin-left: -9px;
-    border-top-width: 0;
-    border-bottom-color: $white;
-  }
-  &.left:before {
-    left: 100%;
-    top: 20%;
-    margin-top: -10px;
-    border-right-width: 0;
-    border-left-color: #b9b9b9;
-  }
-  &.left:after {
-    left: 100%;
-    top: 20%;
-    margin-top: -9px;
-    border-right-width: 0;
-    border-left-color: $white;
-  }
-}
\ No newline at end of file
diff --git a/config/initializers/discourse_iife.rb b/config/initializers/discourse_iife.rb
new file mode 100644
index 00000000000..56e6a4cb8cd
--- /dev/null
+++ b/config/initializers/discourse_iife.rb
@@ -0,0 +1,3 @@
+require 'discourse_iife'
+
+Rails.application.assets.register_preprocessor('application/javascript', DiscourseIIFE)
\ No newline at end of file
diff --git a/config/jshint.yml b/config/jshint.yml
index c931431108d..9d572e964d9 100644
--- a/config/jshint.yml
+++ b/config/jshint.yml
@@ -62,6 +62,7 @@ passfail: false     # true if the scan should stop on first error (per file)
 predef:
   - Ember
   - jQuery
+  - $
   - RSVP
   - Discourse
   - $LAB
diff --git a/lib/discourse_iife.rb b/lib/discourse_iife.rb
new file mode 100644
index 00000000000..cd3ca206998
--- /dev/null
+++ b/lib/discourse_iife.rb
@@ -0,0 +1,22 @@
+class DiscourseIIFE < Sprockets::Processor
+
+  # Add a IIFE around our javascript
+  def evaluate(context, locals)
+
+    path = context.pathname.to_s
+    
+    # Only discourse or admin paths
+    return data unless (path =~ /\/javascripts\/discourse/ or path =~ /\/javascripts\/admin/)
+
+    # Ugh, ignore translations
+    return data if (path =~ /\/translations/)
+
+    # We don't add IIFEs to handlebars
+    return data if path =~ /\.handlebars/
+    return data if path =~ /\.shbrs/    
+    return data if path =~ /\.hbrs/    
+
+    "(function () {\n\nvar $ = window.jQuery;\n\n#{data}\n\n})(this);"
+  end
+
+end
\ No newline at end of file
diff --git a/lib/oneboxer/discourse_onebox.rb b/lib/oneboxer/discourse_onebox.rb
index a1e8c4aa6f5..9fe7308ea9b 100644
--- a/lib/oneboxer/discourse_onebox.rb
+++ b/lib/oneboxer/discourse_onebox.rb
@@ -36,20 +36,20 @@ module Oneboxer
 
           excerpt = post.excerpt(SiteSetting.post_onebox_maxlength)
           excerpt.gsub!("\n"," ")
-          # hack to make it render for now 
+          # hack to make it render for now
           excerpt.gsub!("[/quote]", "[quote]")
           quote = "[quote=\"#{post.user.username}, topic:#{topic.id}, slug:#{slug}, post:#{post.post_number}\"]#{excerpt}[/quote]"
-          
+
           cooked = PrettyText.cook(quote)
-          return cooked 
+          return cooked
 
         else
           # Topic Link
-          topic = Topic.where(id: route[:topic_id].to_i).includes(:user).first   
+          topic = Topic.where(id: route[:topic_id].to_i).includes(:user).first
           post = topic.posts.first
           Guardian.new(nil).ensure_can_see!(topic)
 
-          posters = topic.posters_summary.map do |p| 
+          posters = topic.posters_summary.map do |p|
             {username: p[:user][:username],
              avatar: PrettyText.avatar_img(p[:user][:username], 'tiny'),
              description: p[:description],
@@ -58,8 +58,7 @@ module Oneboxer
 
           category = topic.category
           if category
-            category = "#{category.name}"
- 
+            category = "#{category.name}"
           end
 
           quote = post.excerpt(SiteSetting.post_onebox_maxlength)
@@ -76,7 +75,7 @@ module Oneboxer
 
           @template = 'topic'
         end
-        
+
       end
 
       return nil unless @template
diff --git a/spec/fixtures/oneboxer/android.response b/spec/fixtures/oneboxer/android.response
index 7509c49dd87..1d427fdc28e 100644
--- a/spec/fixtures/oneboxer/android.response
+++ b/spec/fixtures/oneboxer/android.response
@@ -43,8 +43,8 @@ U=d("es"),s,D=0;s=function(a,b){p.a(b)&&(D|=a)};s(1,"");s(2,"");s(4,"");s(8,"");
 function Fb(a){"number"==typeof a&&(a+="");return"string"==typeof a?a.replace(".","%2E").replace(",","%2C"):a}v=Eb;q("il",v,x);var Gb={};y.il=Gb;var Hb=function(a,b,c,d,g,f,j,k,l,n){E(function(){m.paa(a,b,c,d,g,f,j,k,l,n)})},Ib=function(){E(function(){m.prm()})},Jb=function(a){E(function(){m.spn(a)})},Kb=function(a){E(function(){m.sps(a)})},Lb=function(a){E(function(){m.spp(a)})},Mb={"27":"//ssl.gstatic.com/gb/images/silhouette_24.png","27":"//ssl.gstatic.com/gb/images/silhouette_24.png","27":"//ssl.gstatic.com/gb/images/silhouette_24.png"},Nb=function(a){return(a=Mb[a])||"//ssl.gstatic.com/gb/images/silhouette_24.png"},
 Ob=function(){E(function(){m.spd()})};q("spn",Jb);q("spp",Lb);q("sps",Kb);q("spd",Ob);q("paa",Hb);q("prm",Ib);cb("gbd4",Ib);
 if(p.a("")){var Pb={d:p.a(""),e:"",sanw:p.a(""),p:"//ssl.gstatic.com/gb/images/silhouette_96.png",cp:"1",xp:p.a("1"),mg:"%1$s (delegada)",md:"%1$s (predeterminada)",mh:"220",s:"1",pp:Nb,ppl:p.a(""),ppa:p.a(""),ppm:"Página de Google+"};
-y.prf=Pb};var X,Qb,Y,Rb,Z=0,Sb=function(a,b,c){if(a.indexOf)return a.indexOf(b,c);if(Array.indexOf)return Array.indexOf(a,b,c);for(c=c==h?0:0>c?Math.max(0,a.length+c):c;cc?Math.max(0,a.length+c):c;c
    ').appendTo(jQuery('body')).hide();
+
+    $('
    ').appendTo($('body')).hide();
 
     Discourse.SiteSettings = {}
 
diff --git a/spec/javascripts/key_value_store_spec.js b/spec/javascripts/key_value_store_spec.js
index 7e3f004f136..9469d7a353f 100644
--- a/spec/javascripts/key_value_store_spec.js
+++ b/spec/javascripts/key_value_store_spec.js
@@ -1,7 +1,5 @@
 /*global waitsFor:true expect:true describe:true beforeEach:true it:true */
 
-(function() {
-
   describe("Discourse.KeyValueStore", function() {
     return describe("Setting values", function() {
       var store;
@@ -27,4 +25,4 @@
     });
   });
 
-}).call(this);
+
diff --git a/spec/javascripts/message_bus_spec.js b/spec/javascripts/message_bus_spec.js
index 84f340e4a3f..8d9e10ffe8d 100644
--- a/spec/javascripts/message_bus_spec.js
+++ b/spec/javascripts/message_bus_spec.js
@@ -1,6 +1,4 @@
 /*global waitsFor:true expect:true describe:true beforeEach:true it:true */
-(function() {
-
 
   describe("Discourse.MessageBus", function() {
     return describe("Long polling", function() {
@@ -10,4 +8,4 @@
     });
   });
 
-}).call(this);
+
diff --git a/spec/javascripts/onebox_spec.js b/spec/javascripts/onebox_spec.js
index 51ed4798447..1d942cca96c 100644
--- a/spec/javascripts/onebox_spec.js
+++ b/spec/javascripts/onebox_spec.js
@@ -1,6 +1,4 @@
 /*global waitsFor:true expect:true describe:true beforeEach:true it:true spyOn:true */
-(function() {
-
   describe("Discourse.Onebox", function() {
     beforeEach(function() {
       return spyOn(jQuery, 'ajax').andCallThrough();
@@ -25,4 +23,4 @@
     });
   });
 
-}).call(this);
+
diff --git a/spec/javascripts/preload_store_spec.js b/spec/javascripts/preload_store_spec.js
index f5efb8572cf..4e0dde3d682 100644
--- a/spec/javascripts/preload_store_spec.js
+++ b/spec/javascripts/preload_store_spec.js
@@ -1,7 +1,5 @@
 /*global waitsFor:true expect:true describe:true beforeEach:true it:true runs:true */
 
-(function() {
-
   describe("PreloadStore", function() {
     beforeEach(function() {
       return PreloadStore.store('bane', 'evil');
@@ -115,4 +113,4 @@
     });
   });
 
-}).call(this);
+
diff --git a/spec/javascripts/user_action_spec.js b/spec/javascripts/user_action_spec.js
index 330a91fe235..fe709e798bc 100644
--- a/spec/javascripts/user_action_spec.js
+++ b/spec/javascripts/user_action_spec.js
@@ -1,6 +1,4 @@
 /*global waitsFor:true expect:true describe:true beforeEach:true it:true */
-(function() {
-
   describe("Discourse.UserAction", function() {
     return describe("collapseStream", function() {
       return it("collapses all likes", function() {
@@ -31,4 +29,4 @@
     });
   });
 
-}).call(this);
+
diff --git a/spec/javascripts/utilities_spec.js b/spec/javascripts/utilities_spec.js
index 0f936ca0c09..a062dbf1adc 100644
--- a/spec/javascripts/utilities_spec.js
+++ b/spec/javascripts/utilities_spec.js
@@ -1,7 +1,5 @@
 /*global waitsFor:true expect:true describe:true beforeEach:true it:true */
 
-(function() {
-
   describe("Discourse.Utilities", function() {
     describe("categoryUrlId", function() {
       it("returns the slug when it exists", function() {
@@ -133,4 +131,4 @@
     });
   });
 
-}).call(this);
+
diff --git a/spec/phantom_js/smoke_test.js b/spec/phantom_js/smoke_test.js
index d7dcb49953d..05fe19e52f9 100644
--- a/spec/phantom_js/smoke_test.js
+++ b/spec/phantom_js/smoke_test.js
@@ -20,7 +20,7 @@ page.waitFor = function(desc, fn, timeout, after) {
 
     try {
       r = page.evaluate(fn);
-    } 
+    }
     catch(err) {
       // next time
     }
@@ -77,7 +77,7 @@ var run = function(){
           allPassed = allPassed && success;
           performNextAction();
         });
-      } 
+      }
       else if(action.navigate) {
         console.log("NAVIGATE: " + action.desc);
         page.evaluate(action.navigate);
@@ -92,33 +92,33 @@ var run = function(){
 page.runTests = function(){
 
   test("more than one topic shows up", function() {
-    return jQuery('#topic-list tbody tr').length > 0;
+    return $('#topic-list tbody tr').length > 0;
   });
 
   test("expect a log in button", function(){
-    return jQuery('.current-username .btn').text() === 'Log In';
+    return $('.current-username .btn').text() === 'Log In';
   });
 
   navigate("navigate to first topic", function(){
     Em.run.later(function(){
-      jQuery('.main-link a:first').click();
+      $('.main-link a:first').click();
     }, 500);
   });
 
   test("at least one post body", function(){
-    return jQuery('.topic-post').length > 0;
+    return $('.topic-post').length > 0;
   });
-  
+
   navigate("navigate to first user", function(){
     // for whatever reason the clicks do not respond at the begining
     //  defering
     Em.run.later(function(){
-      jQuery('.topic-meta-data a:first').focus().click();
+      $('.topic-meta-data a:first').focus().click();
     },500);
   });
 
   test("has about me section",function(){
-    return jQuery('.about-me').length === 1;
+    return $('.about-me').length === 1;
   });
 
   run();
diff --git a/sublime-project b/sublime-project
index 59d6457f2cd..20b3719133d 100644
--- a/sublime-project
+++ b/sublime-project
@@ -3,7 +3,7 @@
     [
       {
         "path": "app",
-        "folder_exclude_patterns": ["external", "external_production", "images", "imported", "fonts"]
+        "folder_exclude_patterns": ["external", "external_production", "images", "imported", "fonts", "defer"]
       },
       {"path": "config"},
       {