mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Enable JSHINT's unused option. It caught a bunch of suspicious stuff which is fixed in this commit.
This commit is contained in:
@@ -50,7 +50,7 @@ Discourse.ScreenedIpAddressFormComponent = Ember.Component.extend({
|
||||
}
|
||||
},
|
||||
|
||||
didInsertElement: function(e) {
|
||||
didInsertElement: function() {
|
||||
var self = this;
|
||||
this._super();
|
||||
Em.run.schedule('afterRender', function() {
|
||||
|
||||
@@ -13,9 +13,8 @@ Discourse.AdminApiController = Ember.ArrayController.extend({
|
||||
Generates a master api key
|
||||
|
||||
@method generateMasterKey
|
||||
@param {Discourse.ApiKey} the key to regenerate
|
||||
**/
|
||||
generateMasterKey: function(key) {
|
||||
generateMasterKey: function() {
|
||||
var self = this;
|
||||
Discourse.ApiKey.generateMasterKey().then(function (key) {
|
||||
self.get('model').pushObject(key);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
Handlebars.registerHelper('valueAtTrustLevel', function(property, trustLevel) {
|
||||
var data = Ember.Handlebars.get(this, property);
|
||||
if( data ) {
|
||||
var item = data.find( function(d, i, arr) { return parseInt(d.x,10) === parseInt(trustLevel,10); } );
|
||||
var item = data.find( function(d) { return parseInt(d.x,10) === parseInt(trustLevel,10); } );
|
||||
if( item ) {
|
||||
return item.y;
|
||||
} else {
|
||||
|
||||
@@ -31,7 +31,7 @@ Discourse.AdminUser = Discourse.User.extend({
|
||||
**/
|
||||
revokeApiKey: function() {
|
||||
var self = this;
|
||||
return Discourse.ajax("/admin/users/" + this.get('id') + "/revoke_api_key", {type: 'DELETE'}).then(function (result) {
|
||||
return Discourse.ajax("/admin/users/" + this.get('id') + "/revoke_api_key", {type: 'DELETE'}).then(function () {
|
||||
self.set('api_key', null);
|
||||
});
|
||||
},
|
||||
@@ -51,7 +51,7 @@ Discourse.AdminUser = Discourse.User.extend({
|
||||
"label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t("admin.user.delete_all_posts"),
|
||||
"class": "btn btn-danger",
|
||||
"callback": function() {
|
||||
Discourse.ajax("/admin/users/" + (user.get('id')) + "/delete_all_posts", {type: 'PUT'}).then(function(result){
|
||||
Discourse.ajax("/admin/users/" + (user.get('id')) + "/delete_all_posts", {type: 'PUT'}).then(function(){
|
||||
user.set('post_count', 0);
|
||||
});
|
||||
}
|
||||
@@ -274,7 +274,7 @@ Discourse.AdminUser = Discourse.User.extend({
|
||||
user.mergeAttributes(data.user);
|
||||
}
|
||||
}
|
||||
}, function(jqXHR, status, error) {
|
||||
}, function() {
|
||||
Discourse.AdminUser.find( user.get('username') ).then(function(u){ user.mergeAttributes(u); });
|
||||
bootbox.alert(I18n.t("admin.user.delete_failed"));
|
||||
});
|
||||
@@ -325,7 +325,7 @@ Discourse.AdminUser = Discourse.User.extend({
|
||||
} else {
|
||||
bootbox.alert(I18n.t("admin.user.delete_failed"));
|
||||
}
|
||||
}, function(jqXHR, status, error) {
|
||||
}, function() {
|
||||
bootbox.alert(I18n.t("admin.user.delete_failed"));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -29,7 +29,6 @@ Discourse.ApiKey = Discourse.Model.extend({
|
||||
@returns {Promise} a promise that resolves when the key has been revoked
|
||||
**/
|
||||
revoke: function() {
|
||||
var self = this;
|
||||
return Discourse.ajax('/admin/api/key', {type: 'DELETE', data: {id: this.get('id')}});
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ Discourse.Group = Discourse.Model.extend({
|
||||
return Discourse.ajax("/admin/groups/" + group.get('id'), {type: "DELETE"})
|
||||
.then(function(){
|
||||
return true;
|
||||
}, function(error) {
|
||||
}, function() {
|
||||
group.set('disableSave', false);
|
||||
bootbox.alert(I18n.t("admin.groups.delete_failed"));
|
||||
return false;
|
||||
@@ -108,15 +108,5 @@ Discourse.Group.reopenClass({
|
||||
});
|
||||
|
||||
return list;
|
||||
},
|
||||
|
||||
find: function(id) {
|
||||
var promise = new Em.Deferred();
|
||||
|
||||
setTimeout(function(){
|
||||
promise.resolve(Discourse.Group.create({id: 1, name: "all mods", members: ["A","b","c"]}));
|
||||
}, 1000);
|
||||
|
||||
return promise;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -6,7 +6,7 @@ Discourse.Report = Discourse.Model.extend({
|
||||
valueAt: function(numDaysAgo) {
|
||||
if (this.data) {
|
||||
var wantedDate = moment().subtract('days', numDaysAgo).format('YYYY-MM-DD');
|
||||
var item = this.data.find( function(d, i, arr) { return d.x === wantedDate; } );
|
||||
var item = this.data.find( function(d) { return d.x === wantedDate; } );
|
||||
if (item) {
|
||||
return item.y;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ Discourse.ScreenedEmail = Discourse.Model.extend({
|
||||
});
|
||||
|
||||
Discourse.ScreenedEmail.reopenClass({
|
||||
findAll: function(filter) {
|
||||
findAll: function() {
|
||||
return Discourse.ajax("/admin/logs/screened_emails.json").then(function(screened_emails) {
|
||||
return screened_emails.map(function(b) {
|
||||
return Discourse.ScreenedEmail.create(b);
|
||||
|
||||
@@ -45,7 +45,7 @@ Discourse.ScreenedIpAddress = Discourse.Model.extend({
|
||||
});
|
||||
|
||||
Discourse.ScreenedIpAddress.reopenClass({
|
||||
findAll: function(filter) {
|
||||
findAll: function() {
|
||||
return Discourse.ajax("/admin/logs/screened_ip_addresses.json").then(function(screened_ips) {
|
||||
return screened_ips.map(function(b) {
|
||||
return Discourse.ScreenedIpAddress.create(b);
|
||||
|
||||
@@ -13,7 +13,7 @@ Discourse.ScreenedUrl = Discourse.Model.extend({
|
||||
});
|
||||
|
||||
Discourse.ScreenedUrl.reopenClass({
|
||||
findAll: function(filter) {
|
||||
findAll: function() {
|
||||
return Discourse.ajax("/admin/logs/screened_urls.json").then(function(screened_urls) {
|
||||
return screened_urls.map(function(b) {
|
||||
return Discourse.ScreenedUrl.create(b);
|
||||
|
||||
@@ -12,7 +12,7 @@ Discourse.AdminSiteContentsRoute = Discourse.Route.extend({
|
||||
return Discourse.SiteContentType.findAll();
|
||||
},
|
||||
|
||||
renderTemplate: function(controller, model) {
|
||||
renderTemplate: function() {
|
||||
this.render('admin/templates/site_contents', {into: 'admin/templates/admin'});
|
||||
this.render('admin/templates/site_contents_empty', {into: 'admin/templates/site_contents'});
|
||||
},
|
||||
|
||||
@@ -42,7 +42,7 @@ Discourse.AceEditorView = Discourse.View.extend({
|
||||
aceEditorView.editor.setTheme("ace/theme/chrome");
|
||||
aceEditorView.editor.setShowPrintMargin(false);
|
||||
aceEditorView.editor.getSession().setMode("ace/mode/" + (aceEditorView.get('mode')));
|
||||
aceEditorView.editor.on("change", function(e) {
|
||||
aceEditorView.editor.on("change", function() {
|
||||
aceEditorView.skipContentChangeEvent = true;
|
||||
aceEditorView.set('content', aceEditorView.editor.getSession().getValue());
|
||||
aceEditorView.skipContentChangeEvent = false;
|
||||
|
||||
Reference in New Issue
Block a user