Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup .jshintrc since no globals are used anymore #3984

Merged
merged 1 commit into from
Dec 9, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 2 additions & 38 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,45 +1,9 @@
{
"predef": [
"console",
"requireModule",
"-Promise",
"-Map",
"Ember",
"DS",
"Handlebars",
"Metamorph",
"ember_assert",
"ember_warn",
"ember_deprecate",
"ember_deprecateFunc",
"require",
"define",
"setupStore",
"createStore",
"equal",
"asyncEqual",
"notEqual",
"asyncTest",
"test",
"raises",
"deepEqual",
"start",
"stop",
"ok",
"strictEqual",
"module",
"expect",
"minispade",
"async",
"invokeAsync",
"jQuery",
"expectAssertion",
"expectDeprecation",
"expectNoDeprecation",
"warns",
"noWarns",
"throws",
"-Comment"
"-Map",
"-Promise"
],
"node" : false,
"browser" : true,
Expand Down
2 changes: 2 additions & 0 deletions addon/adapters/build-url-mixin.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Ember from 'ember';

var get = Ember.get;

/**
Expand Down
2 changes: 2 additions & 0 deletions addon/adapters/errors.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import Ember from 'ember';
import {assert} from 'ember-data/debug';

const EmberError = Ember.Error;

const SOURCE_POINTER_REGEXP = /^\/?data\/(attributes|relationships)\/(.*)/;
Expand Down
1 change: 1 addition & 0 deletions addon/adapters/json-api-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@module ember-data
*/

import Ember from 'ember';
import RESTAdapter from "ember-data/adapters/rest-adapter";

/**
Expand Down
1 change: 1 addition & 0 deletions addon/adapters/rest-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@module ember-data
*/

import Ember from 'ember';
import Adapter from "ember-data/system/adapter";
import {
AdapterError,
Expand Down
1 change: 1 addition & 0 deletions addon/ember-initializer.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import setupContainer from 'ember-data/setup-container';
import initializeStoreService from 'ember-data/instance-initializers/initialize-store-service';

Expand Down
2 changes: 2 additions & 0 deletions addon/ext/date.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
@module ember-data
*/

import Ember from 'ember';

/**
Date.parse with progressive enhancement for ISO 8601 <https://github.com/csnover/js-iso8601>

Expand Down
1 change: 1 addition & 0 deletions addon/serializers/embedded-records-mixin.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { warn } from "ember-data/debug";

var get = Ember.get;
Expand Down
1 change: 1 addition & 0 deletions addon/serializers/json-api-serializer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@module ember-data
*/

import Ember from 'ember';
import { assert, runInDebug, warn } from 'ember-data/debug';
import JSONSerializer from 'ember-data/serializers/json-serializer';
import normalizeModelName from 'ember-data/system/normalize-model-name';
Expand Down
1 change: 1 addition & 0 deletions addon/serializers/json-serializer.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { assert, warn } from 'ember-data/debug';
import Serializer from "ember-data/system/serializer";
import coerceId from "ember-data/system/coerce-id";
Expand Down
1 change: 1 addition & 0 deletions addon/serializers/rest-serializer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@module ember-data
*/

import Ember from 'ember';
import { assert, deprecate, runInDebug, warn } from "ember-data/debug";
import JSONSerializer from "ember-data/serializers/json-serializer";
import normalizeModelName from "ember-data/system/normalize-model-name";
Expand Down
1 change: 1 addition & 0 deletions addon/system/adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@module ember-data
*/

import Ember from 'ember';
var get = Ember.get;

/**
Expand Down
1 change: 1 addition & 0 deletions addon/system/debug/debug-adapter.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/**
@module ember-data
*/
import Ember from 'ember';
import Model from "ember-data/system/model";
var get = Ember.get;
var capitalize = Ember.String.capitalize;
Expand Down
2 changes: 2 additions & 0 deletions addon/system/is-array-like.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Ember from 'ember';

/*
We're using this to detect arrays and "array-like" objects.

Expand Down
1 change: 1 addition & 0 deletions addon/system/many-array.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/**
@module ember-data
*/
import Ember from 'ember';
import { assert } from "ember-data/debug";
import { PromiseArray } from "ember-data/system/promise-proxies";

Expand Down
1 change: 1 addition & 0 deletions addon/system/model/attributes.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import Model from "ember-data/system/model/model";
import { assert, deprecate } from "ember-data/debug";

Expand Down
1 change: 1 addition & 0 deletions addon/system/model/errors.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { deprecate, warn } from "ember-data/debug";

var get = Ember.get;
Expand Down
1 change: 1 addition & 0 deletions addon/system/model/errors/invalid.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
var EmberError = Ember.Error;

/**
Expand Down
1 change: 1 addition & 0 deletions addon/system/model/internal-model.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { assert } from "ember-data/debug";
import merge from "ember-data/system/merge";
import RootState from "ember-data/system/model/states";
Expand Down
1 change: 1 addition & 0 deletions addon/system/model/model.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { assert, deprecate } from "ember-data/debug";
import { PromiseObject } from "ember-data/system/promise-proxies";
import Errors from "ember-data/system/model/errors";
Expand Down
1 change: 1 addition & 0 deletions addon/system/model/states.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/**
@module ember-data
*/
import Ember from 'ember';
import { assert } from "ember-data/debug";

var get = Ember.get;
Expand Down
2 changes: 2 additions & 0 deletions addon/system/normalize-model-name.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Ember from 'ember';

/**
All modelNames are dasherized internally. Changing this function may
require changes to other normalization hooks (such as typeForRoot).
Expand Down
2 changes: 2 additions & 0 deletions addon/system/ordered-set.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Ember from 'ember';

var EmberOrderedSet = Ember.OrderedSet;
var guidFor = Ember.guidFor;

Expand Down
1 change: 1 addition & 0 deletions addon/system/promise-proxies.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { assert } from "ember-data/debug";

var Promise = Ember.RSVP.Promise;
Expand Down
1 change: 1 addition & 0 deletions addon/system/record-array-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@module ember-data
*/

import Ember from 'ember';
import {
RecordArray,
FilteredRecordArray,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import RecordArray from "ember-data/system/record-arrays/record-array";
import cloneNull from "ember-data/system/clone-null";

Expand Down
1 change: 1 addition & 0 deletions addon/system/record-arrays/filtered-record-array.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import RecordArray from "ember-data/system/record-arrays/record-array";

/**
Expand Down
1 change: 1 addition & 0 deletions addon/system/record-arrays/record-array.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@module ember-data
*/

import Ember from 'ember';
import { PromiseArray } from "ember-data/system/promise-proxies";
import SnapshotRecordArray from "ember-data/system/snapshot-record-array";

Expand Down
1 change: 1 addition & 0 deletions addon/system/relationships/belongs-to.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { assert, warn } from "ember-data/debug";
import Model from 'ember-data/system/model';
import normalizeModelName from "ember-data/system/normalize-model-name";
Expand Down
1 change: 1 addition & 0 deletions addon/system/relationships/ext.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { assert, warn } from "ember-data/debug";
import {
typeForRelationshipMeta,
Expand Down
1 change: 1 addition & 0 deletions addon/system/relationships/has-many.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@module ember-data
*/

import Ember from 'ember';
import { assert } from "ember-data/debug";
import Model from "ember-data/system/model";
import normalizeModelName from "ember-data/system/normalize-model-name";
Expand Down
1 change: 1 addition & 0 deletions addon/system/relationships/state/belongs-to.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { assert } from "ember-data/debug";
import {
PromiseObject
Expand Down
1 change: 1 addition & 0 deletions addon/system/relationships/state/create.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import ManyRelationship from "ember-data/system/relationships/state/has-many";
import BelongsToRelationship from "ember-data/system/relationships/state/belongs-to";
import EmptyObject from "ember-data/system/empty-object";
Expand Down
1 change: 1 addition & 0 deletions addon/system/relationships/state/relationship.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { assert, warn } from "ember-data/debug";
import OrderedSet from "ember-data/system/ordered-set";

Expand Down
2 changes: 2 additions & 0 deletions addon/system/serializer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
@module ember-data
*/

import Ember from 'ember';

/**
`DS.Serializer` is an abstract base class that you should override in your
application to customize it for your backend. The minimum set of methods
Expand Down
1 change: 1 addition & 0 deletions addon/system/snapshot.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@module ember-data
*/

import Ember from 'ember';
import EmptyObject from "ember-data/system/empty-object";
var get = Ember.get;

Expand Down
4 changes: 3 additions & 1 deletion addon/system/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
@module ember-data
*/

import Ember from 'ember';
import Model from 'ember-data/system/model';
import { assert, warn } from "ember-data/debug";
import _normalizeLink from "ember-data/system/normalize-link";
import normalizeModelName from "ember-data/system/normalize-model-name";
Expand Down Expand Up @@ -1485,7 +1487,7 @@ Store = Service.extend({
var mixin = owner._lookupFactory('mixin:' + normalizedModelName);
if (mixin) {
//Cache the class as a model
owner.register('model:' + normalizedModelName, DS.Model.extend(mixin));
owner.register('model:' + normalizedModelName, Model.extend(mixin));
}
var factory = this.modelFactoryFor(normalizedModelName);
if (factory) {
Expand Down
2 changes: 2 additions & 0 deletions addon/system/store/common.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Ember from 'ember';

var get = Ember.get;

export function _bind(fn) {
Expand Down
1 change: 1 addition & 0 deletions addon/system/store/finders.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { assert } from "ember-data/debug";
import {
_bind,
Expand Down
1 change: 1 addition & 0 deletions addon/system/store/serializer-response.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import { assert, runInDebug } from "ember-data/debug";

/*
Expand Down
2 changes: 2 additions & 0 deletions addon/transforms/base.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Ember from 'ember';

/**
The `DS.Transform` class is used to serialize and deserialize model
attributes when they are saved or loaded from an
Expand Down
2 changes: 2 additions & 0 deletions addon/transforms/date.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Ember from 'ember';

/**
The `DS.DateTransform` class is used to serialize and deserialize
date attributes on Ember Data record objects. This transform is used
Expand Down
1 change: 1 addition & 0 deletions addon/transforms/number.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Ember from 'ember';
import Transform from "ember-data/transforms/base";

var empty = Ember.isEmpty;
Expand Down
2 changes: 2 additions & 0 deletions addon/transforms/string.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import Ember from 'ember';
import Transform from "ember-data/transforms/base";

var none = Ember.isNone;

/**
Expand Down
22 changes: 1 addition & 21 deletions tests/.jshintrc
Original file line number Diff line number Diff line change
@@ -1,27 +1,7 @@
{
"predef": [
"document",
"window",
"location",
"setTimeout",
"$",
"-Promise",
"define",
"console",
"visit",
"exists",
"fillIn",
"click",
"keyEvent",
"triggerEvent",
"find",
"findWithAssert",
"wait",
"DS",
"andThen",
"currentURL",
"currentPath",
"currentRouteName"
"setTimeout"
],
"node": false,
"browser": false,
Expand Down
1 change: 1 addition & 0 deletions tests/helpers/store.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Ember from 'ember';
import DS from 'ember-data';

export default function setupStore(options) {
var container, registry;
Expand Down