0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00

Remove $ from jshint's predef, always use Ember's $

no issue
- fixes problems with "re-definition of $" errors
This commit is contained in:
Kevin Ansfield 2015-11-18 11:58:26 +00:00
parent 84c8149f6a
commit 413d999462
13 changed files with 16 additions and 11 deletions

View file

@ -5,7 +5,6 @@
"window",
"-Promise",
"-Notification",
"$",
"validator",
"moment"
],

View file

@ -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) {

View file

@ -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(),

View file

@ -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({

View file

@ -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({

View file

@ -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',

View file

@ -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',

View file

@ -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,

View file

@ -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',

View file

@ -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,

View file

@ -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;

View file

@ -1,6 +1,6 @@
import Ember from 'ember';
const {Mixin, run} = Ember;
const {$, Mixin, run} = Ember;
function K() {
return this;

View file

@ -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',