IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some javascript refactoring: Move markdown functions into their own classs, remove extraneous window. calls.

Browse Source
This commit is contained in:
Robin Ward 2013-03-05 14:52:35 -05:00
parent e2ead81818
commit 1416bc7475
18 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/models/admin_user.js
View File

@ -1,13 +1,13 @@
/** /**
Our data model for dealing with users from the admin section. Our data model for dealing with users from the admin section.
@class AdminUser @class AdminUser
@extends Discourse.Model @extends Discourse.Model
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
Discourse.AdminUser = Discourse.Model.extend({ Discourse.AdminUser = Discourse.Model.extend({
deleteAllPosts: function() { deleteAllPosts: function() {
this.set('can_delete_all_posts', false); this.set('can_delete_all_posts', false);
jQuery.ajax("/admin/users/" + (this.get('id')) + "/delete_all_posts", {type: 'PUT'}); jQuery.ajax("/admin/users/" + (this.get('id')) + "/delete_all_posts", {type: 'PUT'});
@ -137,7 +137,7 @@ Discourse.AdminUser = Discourse.Model.extend({
}); });
window.Discourse.AdminUser.reopenClass({ Discourse.AdminUser.reopenClass({
bulkApprove: function(users) { bulkApprove: function(users) {
users.each(function(user) { users.each(function(user) {

2
app/assets/javascripts/discourse/components/transition_helper.js
View File

@ -34,7 +34,7 @@ _getTransitionEndEventName = function() {
}; };
transitionEnd = _getTransitionEndEventName(); transitionEnd = _getTransitionEndEventName();
window.Discourse.TransitionHelper = { Discourse.TransitionHelper = {
after: function(element, callback) { after: function(element, callback) {
return $(element).on(transitionEnd, callback); return $(element).on(transitionEnd, callback);
} }

4
app/assets/javascripts/discourse/models/category_list.js
View File

@ -6,9 +6,9 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
window.Discourse.CategoryList = Discourse.Model.extend({}); Discourse.CategoryList = Discourse.Model.extend({});
window.Discourse.CategoryList.reopenClass({ Discourse.CategoryList.reopenClass({
categoriesFrom: function(result) { categoriesFrom: function(result) {
var categories, users; var categories, users;

2
app/assets/javascripts/discourse/models/input_validation.js
View File

@ -6,6 +6,6 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
window.Discourse.InputValidation = Discourse.Model.extend({}); Discourse.InputValidation = Discourse.Model.extend({});

2
app/assets/javascripts/discourse/models/post.js
View File

@ -260,7 +260,7 @@ Discourse.Post = Discourse.Model.extend({
}).property('reply_count') }).property('reply_count')
}); });
window.Discourse.Post.reopenClass({ Discourse.Post.reopenClass({
createActionSummary: function(result) { createActionSummary: function(result) {
var lookup; var lookup;

2
app/assets/javascripts/discourse/models/topic.js
View File

@ -343,7 +343,7 @@ Discourse.Topic = Discourse.Model.extend({
} }
}); });
window.Discourse.Topic.reopenClass({ Discourse.Topic.reopenClass({
NotificationLevel: { NotificationLevel: {
WATCHING: 3, WATCHING: 3,
TRACKING: 2, TRACKING: 2,

2
app/assets/javascripts/discourse/models/user_action.js
View File

@ -138,7 +138,7 @@ Discourse.UserAction.reopenClass({
GOT_PRIVATE_MESSAGE: 13 GOT_PRIVATE_MESSAGE: 13
}); });
window.Discourse.UserAction.reopenClass({ Discourse.UserAction.reopenClass({
statGroups: (function() { statGroups: (function() {
var g; var g;
g = {}; g = {};

2
app/assets/javascripts/discourse/views/application_view.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
window.Discourse.ApplicationView = Discourse.View.extend({ Discourse.ApplicationView = Discourse.View.extend({
templateName: 'application' templateName: 'application'
}); });

2
app/assets/javascripts/discourse/views/featured_topics_view.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
window.Discourse.FeaturedTopicsView = Discourse.View.extend({ Discourse.FeaturedTopicsView = Discourse.View.extend({
templateName: 'featured_topics', templateName: 'featured_topics',
classNames: ['category-list-item'] classNames: ['category-list-item']
}); });

2
app/assets/javascripts/discourse/views/list/list_categories_view.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
window.Discourse.ListCategoriesView = Discourse.View.extend({ Discourse.ListCategoriesView = Discourse.View.extend({
templateName: 'list/categories', templateName: 'list/categories',

2
app/assets/javascripts/discourse/views/modal/archetype_options_modal_view.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
window.Discourse.ArchetypeOptionsModalView = window.Discourse.ModalBodyView.extend({ Discourse.ArchetypeOptionsModalView = Discourse.ModalBodyView.extend({
templateName: 'modal/archetype_options', templateName: 'modal/archetype_options',
title: Em.String.i18n('topic.options') title: Em.String.i18n('topic.options')
}); });

2
app/assets/javascripts/discourse/views/search/search_view.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
window.Discourse.SearchView = Discourse.View.extend({ Discourse.SearchView = Discourse.View.extend({
tagName: 'div', tagName: 'div',
classNames: ['d-dropdown'], classNames: ['d-dropdown'],
elementId: 'search-dropdown', elementId: 'search-dropdown',

2
app/assets/javascripts/discourse/views/topic_admin_menu_view.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
window.Discourse.TopicAdminMenuView = Discourse.View.extend({ Discourse.TopicAdminMenuView = Discourse.View.extend({
willDestroyElement: function() { willDestroyElement: function() {
$('html').off('mouseup.discourse-topic-admin-menu'); $('html').off('mouseup.discourse-topic-admin-menu');

6
app/assets/javascripts/discourse/views/topic_view.js
View File

@ -489,7 +489,7 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
} }
}); });
window.Discourse.TopicView.reopenClass({ Discourse.TopicView.reopenClass({
// Scroll to a given post, if in the DOM. Returns whether it was in the DOM or not. // Scroll to a given post, if in the DOM. Returns whether it was in the DOM or not.
scrollTo: function(topicId, postNumber, callback) { scrollTo: function(topicId, postNumber, callback) {
@ -504,11 +504,11 @@ window.Discourse.TopicView.reopenClass({
header = $('header'); header = $('header');
title = $('#topic-title'); title = $('#topic-title');
expectedOffset = title.height() - header.find('.contents').height(); expectedOffset = title.height() - header.find('.contents').height();
if (expectedOffset < 0) { if (expectedOffset < 0) {
expectedOffset = 0; expectedOffset = 0;
} }
$('html, body').scrollTop(existing.offset().top - (header.outerHeight(true) + expectedOffset)); $('html, body').scrollTop(existing.offset().top - (header.outerHeight(true) + expectedOffset));
} }
return true; return true;

2
app/assets/javascripts/discourse/views/user/preferences_email_view.js
View File

@ -6,7 +6,7 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
window.Discourse.PreferencesEmailView = Discourse.View.extend({ Discourse.PreferencesEmailView = Discourse.View.extend({
templateName: 'user/email', templateName: 'user/email',
classNames: ['user-preferences'], classNames: ['user-preferences'],
didInsertElement: function() { didInsertElement: function() {

2
app/assets/javascripts/discourse/views/view.js
View File

@ -7,4 +7,4 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
window.Discourse.View = Ember.View.extend(Discourse.Presence, {}); Discourse.View = Ember.View.extend(Discourse.Presence, {});

22
app/assets/javascripts/env.js
View File

@ -1,16 +1,12 @@
/* These will help us migrate up to the new ember's default behavior // These will help us migrate up to the new ember's default behavior
*/ window.ENV = {
CP_DEFAULT_CACHEABLE: true,
VIEW_PRESERVES_CONTEXT: true,
window.ENV = { MANDATORY_SETTER: false
CP_DEFAULT_CACHEABLE: true, };
VIEW_PRESERVES_CONTEXT: true,
MANDATORY_SETTER: false window.Discourse = {};
}; Discourse.SiteSettings = {};
window.Discourse = {};
window.Discourse.SiteSettings = {};

2
app/views/common/_discourse_javascript.html.erb
View File

@ -36,7 +36,7 @@
Discourse.CDN = '<%= Rails.configuration.action_controller.asset_host %>'; Discourse.CDN = '<%= Rails.configuration.action_controller.asset_host %>';
Discourse.BaseUrl = '<%= RailsMultisite::ConnectionManagement.current_hostname %>'; Discourse.BaseUrl = '<%= RailsMultisite::ConnectionManagement.current_hostname %>';
Discourse.Environment = '<%= Rails.env %>'; Discourse.Environment = '<%= Rails.env %>';
window.Discourse.Router.map(function() { Discourse.Router.map(function() {
return Discourse.routeBuilder.call(this); return Discourse.routeBuilder.call(this);
}); });
Discourse.start() Discourse.start()