Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add semi colon linting to Javascript

This commit is contained in:
Robin Ward 2015-09-15 17:08:50 -04:00
parent 24991c4016
commit 975edceff4
24 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.eslintrc
View File

@ -90,10 +90,7 @@
"no-undef": 2,
"no-unused-vars": 2,
"no-with": 2,
"semi": [
0,
"never"
],
"semi": 2,
"strict": 0,
"valid-typeof": 2,
"wrap-iife": [

2
app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
View File

@ -13,7 +13,7 @@ export default Ember.Controller.extend({
}.property('problems'),
thereWereProblems: function() {
if(!Discourse.User.currentProp('admin')) { return false }
if(!Discourse.User.currentProp('admin')) { return false; }
if( this.get('foundProblems') ) {
this.set('hadProblems', true);
return true;

4
app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
View File

@ -56,8 +56,8 @@ export default Ember.Controller.extend({
saveAll: function(){
var self = this;
var items = this.get('workingCopy');
var groupIds = items.map(function(i){return i.get("id") || -1});
var names = items.map(function(i){return i.get("name")});
var groupIds = items.map(function(i){return i.get("id") || -1;});
var names = items.map(function(i){return i.get("name");});
Discourse.ajax('/admin/badges/badge_groupings',{
data: {ids: groupIds, names: names},

14
app/assets/javascripts/discourse.js
View File

@ -152,10 +152,10 @@ function proxyDep(propName, moduleFunc, msg) {
});
}
proxyDep('computed', function() { return require('discourse/lib/computed') });
proxyDep('Formatter', function() { return require('discourse/lib/formatter') });
proxyDep('PageTracker', function() { return require('discourse/lib/page-tracker').default });
proxyDep('URL', function() { return require('discourse/lib/url').default });
proxyDep('Quote', function() { return require('discourse/lib/quote').default });
proxyDep('debounce', function() { return require('discourse/lib/debounce').default });
proxyDep('View', function() { return Ember.View }, "Use `Ember.View` instead");
proxyDep('computed', function() { return require('discourse/lib/computed'); });
proxyDep('Formatter', function() { return require('discourse/lib/formatter'); });
proxyDep('PageTracker', function() { return require('discourse/lib/page-tracker').default; });
proxyDep('URL', function() { return require('discourse/lib/url').default; });
proxyDep('Quote', function() { return require('discourse/lib/quote').default; });
proxyDep('debounce', function() { return require('discourse/lib/debounce').default; });
proxyDep('View', function() { return Ember.View; }, "Use `Ember.View` instead");

2
app/assets/javascripts/discourse/components/category-drop.js.es6
View File

@ -47,7 +47,7 @@ export default Ember.Component.extend({
if (color) {
var style = "";
if (color) { style += "background-color: #" + color + ";" }
if (color) { style += "background-color: #" + color + ";"; }
return style.htmlSafe();
}
}

2
app/assets/javascripts/discourse/components/group-selector.js.es6
View File

@ -25,7 +25,7 @@ export default Ember.Component.extend({
}
return groups.filter(function(group){
return !selectedGroups.any(function(s){return s === group.name});
return !selectedGroups.any(function(s){return s === group.name;});
});
});
},

2
app/assets/javascripts/discourse/components/search-menu.js.es6
View File

@ -61,7 +61,7 @@ export default Ember.Component.extend({
@observes('searchService.term', 'typeFilter')
newSearchNeeded() {
this.set('noResults', false);
const term = this.get('searchService.term')
const term = this.get('searchService.term');
if (isValidSearchTerm(term)) {
this.set('loading', true);
Ember.run.debounce(this, 'searchTerm', term, this.get('typeFilter'), 400);

2
app/assets/javascripts/discourse/components/track-selected.js.es6
View File

@ -11,4 +11,4 @@ export default Ember.Component.extend({
list.removeObject(id);
}
}.observes('selected')
})
});

6
app/assets/javascripts/discourse/controllers/full-page-search.js.es6
View File

@ -24,7 +24,7 @@ export default Ember.Controller.extend({
return (!skip && context) || skip === "false";
},
set(val) {
this.set('skip_context', val ? "false" : "true" )
this.set('skip_context', val ? "false" : "true" );
}
},
@ -100,7 +100,7 @@ export default Ember.Controller.extend({
const model = translateResults(results) || {};
router.transientCache('lastSearch', { searchKey, model }, 5);
this.set("model", model);
}).finally(() => {this._searching = false});
}).finally(() => this._searching = false);
},
actions: {
@ -116,7 +116,7 @@ export default Ember.Controller.extend({
},
clearAll() {
this.get('selected').clear()
this.get('selected').clear();
$('.fps-result input[type=checkbox]').prop('checked', false);
},

2
app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
View File

@ -34,7 +34,7 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, {
showApplyAll: function() {
let anyChanged = false;
this.get('categoriesBuffered').forEach(bc => { anyChanged = anyChanged || bc.get('hasBufferedChanges') });
this.get('categoriesBuffered').forEach(bc => { anyChanged = anyChanged || bc.get('hasBufferedChanges'); });
return anyChanged;
}.property('categoriesBuffered.@each.hasBufferedChanges'),

2
app/assets/javascripts/discourse/lib/censored-words.js
View File

@ -22,4 +22,4 @@ Discourse.CensoredWords = {
}
return text;
}
}
};

2
app/assets/javascripts/discourse/lib/key-value-store.js.es6
View File

@ -14,7 +14,7 @@ try {
const KeyValueStore = function(ctx) {
this.context = ctx;
}
};
KeyValueStore.prototype = {
abandonLocal() {

2
app/assets/javascripts/discourse/lib/screen-track.js.es6
View File

@ -30,7 +30,7 @@ const ScreenTrack = Ember.Object.extend({
self.tick();
}, 1000));
$(window).on('scroll.screentrack', function(){self.scrolled()});
$(window).on('scroll.screentrack', function(){self.scrolled();});
}
this.set('topicId', topicId);

2
app/assets/javascripts/discourse/lib/search.js.es6
View File

@ -103,7 +103,7 @@ const searchContextDescription = function(type, name){
const getSearchKey = function(args){
return args.q + "|" + ((args.searchContext && args.searchContext.type) || "") + "|" +
((args.searchContext && args.searchContext.id) || "")
((args.searchContext && args.searchContext.id) || "");
};
const isValidSearchTerm = function(searchTerm) {

2
app/assets/javascripts/discourse/lib/utilities.js
View File

@ -99,7 +99,7 @@ Discourse.Utilities = {
div.innerHTML = html;
var $div = $(div);
// Find all emojis and replace with its title attribute.
$div.find('img.emoji').replaceWith(function() { return this.title });
$div.find('img.emoji').replaceWith(function() { return this.title; });
$('.clicks', $div).remove();
var text = div.textContent || div.innerText || "";

6
app/assets/javascripts/discourse/mixins/stale-local-storage.js.es6
View File

@ -10,7 +10,7 @@ export default {
findStale(store, type, findArgs, opts) {
const staleResult = new StaleResult();
const key = (opts && opts.storageKey) || this.storageKey(type, findArgs)
const key = (opts && opts.storageKey) || this.storageKey(type, findArgs);
try {
const stored = this.keyValueStore.getItem(key);
if (stored) {
@ -24,11 +24,11 @@ export default {
},
find(store, type, findArgs, opts) {
const key = (opts && opts.storageKey) || this.storageKey(type, findArgs)
const key = (opts && opts.storageKey) || this.storageKey(type, findArgs);
return this._super(store, type, findArgs).then((results) => {
this.keyValueStore.setItem(key, JSON.stringify(results));
return results;
});
}
}
};

2
app/assets/javascripts/discourse/models/nav-item.js.es6
View File

@ -104,7 +104,7 @@ NavItem.reopenClass({
buildList(category, args) {
args = args || {};
if (category) { args.category = category }
if (category) { args.category = category; }
let items = Discourse.SiteSettings.top_menu.split("|");

2
app/assets/javascripts/discourse/routes/build-category-route.js.es6
View File

@ -103,4 +103,4 @@ export default (filter, params) => {
}
}
});
}
};

2
app/assets/javascripts/discourse/routes/full-page-search.js.es6
View File

@ -11,7 +11,7 @@ export default Discourse.Route.extend({
args.search_context = {
type: params.context,
id: params.context_id
}
};
}
const searchKey = getSearchKey(args);

4
app/assets/javascripts/discourse/routes/user.js.es6
View File

@ -61,7 +61,7 @@ export default Discourse.Route.extend({
setupController(controller, user) {
controller.set('model', user);
this.searchService.set('searchContext', user.get('searchContext'))
this.searchService.set('searchContext', user.get('searchContext'));
},
activate() {
@ -77,7 +77,7 @@ export default Discourse.Route.extend({
this.messageBus.unsubscribe("/users/" + this.modelFor('user').get('username_lower'));
// Remove the search context
this.searchService.set('searchContext', null)
this.searchService.set('searchContext', null);
}
});

2
app/assets/javascripts/discourse/views/composer.js.es6
View File

@ -272,7 +272,7 @@ const ComposerView = Ember.View.extend(Ember.Evented, {
position: "absolute",
left: toolbarPos.left + pos.left,
top: toolbarPos.top + pos.top,
}
};
controller.send('showOptions', location);
}
}];

2
app/assets/javascripts/discourse/views/full-page-search.js.es6
View File

@ -1 +1 @@
export default Ember.View.extend({});
export default Ember.View.extend();

2
test/javascripts/components/d-link-test.js.es6
View File

@ -56,6 +56,6 @@ componentTest('with an action', {
assert.ok(true, 'it fired the action');
});
click('a')
click('a');
}
});

4
test/javascripts/components/menu-panel-test.js.es6
View File

@ -24,7 +24,7 @@ componentTest('as a dropdown', {
assert.ok(!exists(".menu-panel.hidden"), "toggling visible makes it appear");
});
click('#outside-area')
click('#outside-area');
andThen(() => {
assert.ok(exists(".menu-panel.hidden"), "clicking the body hides the menu");
assert.equal(this.get('panelVisible'), false, 'it updates the bound variable');
@ -54,7 +54,7 @@ componentTest('as a slide-in', {
assert.ok(!exists(".menu-panel.hidden"), "toggling visible makes it appear");
});
click('#outside-area')
click('#outside-area');
andThen(() => {
assert.ok(exists(".menu-panel.hidden"), "clicking the body hides the menu");
assert.equal(this.get('panelVisible'), false, 'it updates the bound variable');