IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-07-29 23:58:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

More Markdown refactoring - fixed bug with Pagedown not showing on user profile - replaced jQuery occurrences with $.

Browse Source
This commit is contained in:
Robin Ward
2013-03-05 15:39:21 -05:00
parent cf09e200a5
commit 86af49e663
43 changed files with 190 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/controllers/admin_email_logs_controller.js
+6 -6
View File
@@ -1,18 +1,18 @@
/**
This controller supports the interface for reviewing email logs.
@class AdminEmailLogsController
@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'),
@@ -25,7 +25,7 @@ Discourse.AdminEmailLogsController = Ember.ArrayController.extend(Discourse.Pres
sendTestEmail: function() {
var _this = this;
_this.set('sentTestEmail', false);
jQuery.ajax({
$.ajax({
url: '/admin/email_logs/test',
type: 'POST',
data: { email_address: this.get('testEmailAddress') },
@@ -35,5 +35,5 @@ Discourse.AdminEmailLogsController = Ember.ArrayController.extend(Discourse.Pres
});
return false;
}
});
app/assets/javascripts/admin/models/admin_user.js
+13 -13
View File
@@ -10,7 +10,7 @@ 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'});
$.ajax("/admin/users/" + (this.get('id')) + "/delete_all_posts", {type: 'PUT'});
},
// Revoke the user's admin access
@@ -18,14 +18,14 @@ Discourse.AdminUser = Discourse.Model.extend({
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'});
return $.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'});
$.ajax("/admin/users/" + (this.get('id')) + "/grant_admin", {type: 'PUT'});
},
// Revoke the user's moderation access
@@ -33,18 +33,18 @@ Discourse.AdminUser = Discourse.Model.extend({
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'});
return $.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'});
$.ajax("/admin/users/" + (this.get('id')) + "/grant_moderation", {type: 'PUT'});
},
refreshBrowsers: function() {
jQuery.ajax("/admin/users/" + (this.get('id')) + "/refresh_browsers", {type: 'POST'});
$.ajax("/admin/users/" + (this.get('id')) + "/refresh_browsers", {type: 'POST'});
bootbox.alert("Message sent to all clients!");
},
@@ -52,7 +52,7 @@ Discourse.AdminUser = Discourse.Model.extend({
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'});
$.ajax("/admin/users/" + (this.get('id')) + "/approve", {type: 'PUT'});
},
username_lower: (function() {
@@ -79,7 +79,7 @@ Discourse.AdminUser = Discourse.Model.extend({
_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", {
return $.ajax("/admin/users/" + this.id + "/ban", {
type: 'PUT',
data: {duration: duration},
success: function() {
@@ -99,7 +99,7 @@ Discourse.AdminUser = Discourse.Model.extend({
unban: function() {
var _this = this;
return jQuery.ajax("/admin/users/" + this.id + "/unban", {
return $.ajax("/admin/users/" + this.id + "/unban", {
type: 'PUT',
success: function() {
window.location.reload();
@@ -116,7 +116,7 @@ Discourse.AdminUser = Discourse.Model.extend({
impersonate: function() {
var _this = this;
return jQuery.ajax("/admin/impersonate", {
return $.ajax("/admin/impersonate", {
type: 'POST',
data: {
username_or_email: this.get('username')
@@ -145,7 +145,7 @@ Discourse.AdminUser.reopenClass({
user.set('can_approve', false);
return user.set('selected', false);
});
return jQuery.ajax("/admin/users/approve-bulk", {
return $.ajax("/admin/users/approve-bulk", {
type: 'PUT',
data: {
users: users.map(function(u) {
@@ -158,7 +158,7 @@ Discourse.AdminUser.reopenClass({
find: function(username) {
var promise;
promise = new RSVP.Promise();
jQuery.ajax({
$.ajax({
url: "/admin/users/" + username,
success: function(result) {
return promise.resolve(Discourse.AdminUser.create(result));
@@ -170,7 +170,7 @@ Discourse.AdminUser.reopenClass({
findAll: function(query, filter) {
var result;
result = Em.A();
jQuery.ajax({
$.ajax({
url: "/admin/users/list/" + query + ".json",
data: {
filter: filter
app/assets/javascripts/admin/models/email_log.js
+3 -3
View File
@@ -1,11 +1,11 @@
/**
Our data model for representing an email log.
@class EmailLog
@class EmailLog
@extends Discourse.Model
@namespace Discourse
@module Discourse
**/
**/
Discourse.EmailLog = Discourse.Model.extend({});
Discourse.EmailLog.reopenClass({
@@ -19,7 +19,7 @@ Discourse.EmailLog.reopenClass({
findAll: function(filter) {
var result;
result = Em.A();
jQuery.ajax({
$.ajax({
url: "/admin/email_logs.json",
data: { filter: filter },
success: function(logs) {
app/assets/javascripts/admin/models/flagged_post.js
+6 -6
View File
@@ -1,11 +1,11 @@
/**
Our data model for interacting with flagged posts.
@class FlaggedPost
@class FlaggedPost
@extends Discourse.Post
@namespace Discourse
@module Discourse
**/
**/
Discourse.FlaggedPost = Discourse.Post.extend({
flaggers: (function() {
@@ -49,7 +49,7 @@ Discourse.FlaggedPost = Discourse.Post.extend({
var promise;
promise = new RSVP.Promise();
if (this.get('post_number') === "1") {
return jQuery.ajax("/t/" + this.topic_id, {
return $.ajax("/t/" + this.topic_id, {
type: 'DELETE',
cache: false,
success: function() {
@@ -60,7 +60,7 @@ Discourse.FlaggedPost = Discourse.Post.extend({
}
});
} else {
return jQuery.ajax("/posts/" + this.id, {
return $.ajax("/posts/" + this.id, {
type: 'DELETE',
cache: false,
success: function() {
@@ -76,7 +76,7 @@ Discourse.FlaggedPost = Discourse.Post.extend({
clearFlags: function() {
var promise;
promise = new RSVP.Promise();
jQuery.ajax("/admin/flags/clear/" + this.id, {
$.ajax("/admin/flags/clear/" + this.id, {
type: 'POST',
cache: false,
success: function() {
@@ -99,7 +99,7 @@ Discourse.FlaggedPost.reopenClass({
findAll: function(filter) {
var result;
result = Em.A();
jQuery.ajax({
$.ajax({
url: "/admin/flags/" + filter + ".json",
success: function(data) {
var userLookup;
app/assets/javascripts/admin/models/report.js
+1 -1
View File
@@ -3,7 +3,7 @@ Discourse.Report = Discourse.Model.extend({});
Discourse.Report.reopenClass({
find: function(type) {
var model = Discourse.Report.create();
jQuery.ajax("/admin/reports/" + type, {
$.ajax("/admin/reports/" + type, {
type: 'GET',
success: function(json) {
model.mergeAttributes(json.report);
app/assets/javascripts/admin/models/site_customization.js
+7 -7
View File
@@ -1,11 +1,11 @@
/**
Our data model for interacting with site customizations.
@class SiteCustomization
@class SiteCustomization
@extends Discourse.Model
@namespace Discourse
@module Discourse
**/
**/
Discourse.SiteCustomization = Discourse.Model.extend({
trackedProperties: ['enabled', 'name', 'stylesheet', 'header', 'override_default_style'],
@@ -13,7 +13,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({
this._super();
return this.startTrackingChanges();
},
description: (function() {
return "" + this.name + (this.enabled ? ' (*)' : '');
}).property('selected', 'name'),
@@ -55,7 +55,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({
header: this.header,
override_default_style: this.override_default_style
};
return jQuery.ajax({
return $.ajax({
url: "/admin/site_customizations" + (this.id ? '/' + this.id : ''),
data: {
site_customization: data
@@ -66,8 +66,8 @@ Discourse.SiteCustomization = Discourse.Model.extend({
"delete": function() {
if (!this.id) return;
return jQuery.ajax({
return $.ajax({
url: "/admin/site_customizations/" + this.id,
type: 'DELETE'
});
@@ -93,7 +93,7 @@ Discourse.SiteCustomization.reopenClass({
content: [],
loading: true
});
jQuery.ajax({
$.ajax({
url: "/admin/site_customizations",
dataType: "json",
success: function(data) {
app/assets/javascripts/admin/models/site_setting.js
+2 -2
View File
@@ -72,7 +72,7 @@ Discourse.SiteSetting = Discourse.Model.extend({
save: function() {
// Update the setting
var setting = this;
return jQuery.ajax("/admin/site_settings/" + (this.get('setting')), {
return $.ajax("/admin/site_settings/" + (this.get('setting')), {
data: { value: this.get('value') },
type: 'PUT',
success: function() {
@@ -91,7 +91,7 @@ Discourse.SiteSetting.reopenClass({
**/
findAll: function() {
var result = Em.A();
jQuery.get("/admin/site_settings", function(settings) {
$.get("/admin/site_settings", function(settings) {
return settings.each(function(s) {
s.originalValue = s.value;
return result.pushObject(Discourse.SiteSetting.create(s));
app/assets/javascripts/admin/models/version_check.js
+1 -1
View File
@@ -23,7 +23,7 @@ Discourse.VersionCheck = Discourse.Model.extend({
Discourse.VersionCheck.reopenClass({
find: function() {
var promise = new RSVP.Promise();
jQuery.ajax({
$.ajax({
url: '/admin/version_check',
dataType: 'json',
success: function(json) {