Skip to content

Commit

Permalink
Remove $ from jshint's predef, always use Ember's $
Browse files Browse the repository at this point in the history
no issue
- fixes problems with "re-definition of $" errors
  • Loading branch information
kevinansfield committed Dec 1, 2015
1 parent 84c8149 commit 413d999
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 11 deletions.
1 change: 0 additions & 1 deletion core/client/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"window",
"-Promise",
"-Notification",
"$",
"validator",
"moment"
],
Expand Down
3 changes: 3 additions & 0 deletions core/client/app/assets/lib/uploader.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import Ember from 'ember';
import ghostPaths from 'ghost/utils/ghost-paths';

const {$} = Ember;

let Ghost = ghostPaths();

let UploadUi = function ($dropzone, settings) {
Expand Down
2 changes: 1 addition & 1 deletion core/client/app/components/gh-ed-preview.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Ember from 'ember';
import uploader from 'ghost/assets/lib/uploader';

const {Component, inject, run} = Ember;
const {$, Component, inject, run} = Ember;

export default Component.extend({
config: inject.service(),
Expand Down
2 changes: 1 addition & 1 deletion core/client/app/components/gh-posts-list-item.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Ember from 'ember';

const {Component, computed, inject} = Ember;
const {$, Component, computed, inject} = Ember;
const {alias, equal} = computed;

export default Component.extend({
Expand Down
2 changes: 1 addition & 1 deletion core/client/app/components/gh-search-input.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import Ember from 'ember';
import {request as ajax} from 'ic-ajax';

const {Component, RSVP, computed, inject, observer} = Ember;
const {$, Component, RSVP, computed, inject, observer} = Ember;
const {filterBy} = computed;

export default Component.extend({
Expand Down
2 changes: 1 addition & 1 deletion core/client/app/components/gh-skip-link.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*jshint scripturl:true*/
import Ember from 'ember';

const {Component, on} = Ember;
const {$, Component, on} = Ember;

export default Component.extend({
tagName: 'a',
Expand Down
2 changes: 1 addition & 1 deletion core/client/app/controllers/modals/signin.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Ember from 'ember';
import ValidationEngine from 'ghost/mixins/validation-engine';

const {Controller, computed, inject} = Ember;
const {$, Controller, computed, inject} = Ember;

export default Controller.extend(ValidationEngine, {
validationType: 'signin',
Expand Down
2 changes: 1 addition & 1 deletion core/client/app/controllers/post-settings-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import SlugGenerator from 'ghost/models/slug-generator';
import boundOneWay from 'ghost/utils/bound-one-way';
import isNumber from 'ghost/utils/isNumber';

const {ArrayProxy, Controller, Handlebars, PromiseProxyMixin, RSVP, computed, guidFor, inject, isArray, observer, run} = Ember;
const {$, ArrayProxy, Controller, Handlebars, PromiseProxyMixin, RSVP, computed, guidFor, inject, isArray, observer, run} = Ember;

export default Controller.extend(SettingsMenuMixin, {
debounceId: null,
Expand Down
2 changes: 1 addition & 1 deletion core/client/app/controllers/settings/labs.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Ember from 'ember';
import {request as ajax} from 'ic-ajax';

const {Controller, computed, inject} = Ember;
const {$, Controller, computed, inject} = Ember;

export default Controller.extend({
uploadButtonText: 'Import',
Expand Down
2 changes: 1 addition & 1 deletion core/client/app/controllers/signin.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Ember from 'ember';
import ValidationEngine from 'ghost/mixins/validation-engine';
import {request as ajax} from 'ic-ajax';

const {Controller, inject} = Ember;
const {$, Controller, inject} = Ember;

export default Controller.extend(ValidationEngine, {
submitting: false,
Expand Down
2 changes: 1 addition & 1 deletion core/client/app/mirage/config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
import Ember from 'ember';

const {isBlank} = Ember;
const {$, isBlank} = Ember;

function paginatedResponse(modelName, allModels, request) {
let page = +request.queryParams.page || 1;
Expand Down
2 changes: 1 addition & 1 deletion core/client/app/mixins/body-event-listener.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Ember from 'ember';

const {Mixin, run} = Ember;
const {$, Mixin, run} = Ember;

function K() {
return this;
Expand Down
3 changes: 3 additions & 0 deletions core/client/app/routes/settings/navigation.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import Ember from 'ember';
import AuthenticatedRoute from 'ghost/routes/authenticated';
import CurrentUserSettings from 'ghost/mixins/current-user-settings';
import styleBody from 'ghost/mixins/style-body';

const {$} = Ember;

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
titleToken: 'Settings - Navigation',

Expand Down

0 comments on commit 413d999

Please sign in to comment.