From 5f2cc5b96612afdc1583f3171c6cf4038d7368ba Mon Sep 17 00:00:00 2001 From: reppners Date: Wed, 4 Mar 2015 09:09:27 +0100 Subject: [PATCH] + renaming module JSData_ to JSData since it is possible to declare var and module with the same name --- js-data-angular/js-data-angular-tests.ts | 8 ++--- js-data-angular/js-data-angular.d.ts | 2 +- js-data-http/js-data-http-tests.ts | 4 +-- js-data-http/js-data-http.d.ts | 4 +-- js-data/js-data-tests.ts | 38 ++++++++++++------------ js-data/js-data.d.ts | 6 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/js-data-angular/js-data-angular-tests.ts b/js-data-angular/js-data-angular-tests.ts index 670857dec..8e036212f 100644 --- a/js-data-angular/js-data-angular-tests.ts +++ b/js-data-angular/js-data-angular-tests.ts @@ -12,7 +12,7 @@ interface CustomScope extends ng.IScope { } angular.module('myApp') - .controller('commentsCtrl', function ($scope:CustomScope, store:JSData_.DS, Comment:JSData_.DSResourceDefinition, User:JSData_.DSResourceDefinition) { + .controller('commentsCtrl', function ($scope:CustomScope, store:JSData.DS, Comment:JSData.DSResourceDefinition, User:JSData.DSResourceDefinition) { Comment.findAll().then(function (comments) { $scope.comments = comments; @@ -54,7 +54,7 @@ angular.module('myApp') }); angular.module('myApp') - .run(function (DS:JSData_.DS) { + .run(function (DS:JSData.DS) { // We don't register the "User" resource // as a service, so it can only be used // via DS.('user', ...) @@ -63,7 +63,7 @@ angular.module('myApp') // only ever have to inject "DS" DS.defineResource('user'); }) - .factory('Comment', function (DS:JSData_.DS) { + .factory('Comment', function (DS:JSData.DS) { // This code won't execute unless you actually // inject "Comment" somewhere in your code. // Thanks Angular... @@ -73,6 +73,6 @@ angular.module('myApp') }); angular.module('myApp') - .config(function (DSProvider:JSData_.DSProvider) { + .config(function (DSProvider:JSData.DSProvider) { DSProvider.defaults.basePath = '/myApi'; // etc. }); \ No newline at end of file diff --git a/js-data-angular/js-data-angular.d.ts b/js-data-angular/js-data-angular.d.ts index 851512d15..11a295562 100644 --- a/js-data-angular/js-data-angular.d.ts +++ b/js-data-angular/js-data-angular.d.ts @@ -6,7 +6,7 @@ /// /// -declare module JSData_ { +declare module JSData { interface DSProvider { defaults:DSConfiguration; diff --git a/js-data-http/js-data-http-tests.ts b/js-data-http/js-data-http-tests.ts index 41459ed81..d7c07d654 100644 --- a/js-data-http/js-data-http-tests.ts +++ b/js-data-http/js-data-http-tests.ts @@ -4,7 +4,7 @@ var adapter = new DSHttpAdapter(); var store = new JSData.DS(); store.registerAdapter('http', adapter, { default: true }); -var ADocument:JSData_.DSResourceDefinition = store.defineResource('document'); +var ADocument:JSData.DSResourceDefinition = store.defineResource('document'); ADocument.inject({ id: 5, author: 'John' }); @@ -73,7 +73,7 @@ adapter.GET('/user/1').then(function (data) { data.config; //{...} }); -var User:JSData_.DSResourceDefinition = store.defineResource('user'); +var User:JSData.DSResourceDefinition = store.defineResource('user'); var params:any = { age: { diff --git a/js-data-http/js-data-http.d.ts b/js-data-http/js-data-http.d.ts index 3a8a8adf0..626f55648 100644 --- a/js-data-http/js-data-http.d.ts +++ b/js-data-http/js-data-http.d.ts @@ -5,7 +5,7 @@ /// -declare module JSData_ { +declare module JSData { interface DSHttpAdapterOptions { serialize?: (resourceName:string, data:any)=>any; @@ -43,4 +43,4 @@ declare module JSData_ { } } -declare var DSHttpAdapter:JSData_.DSHttpAdapter; \ No newline at end of file +declare var DSHttpAdapter:JSData.DSHttpAdapter; \ No newline at end of file diff --git a/js-data/js-data-tests.ts b/js-data/js-data-tests.ts index a6ac09a42..35fdbf00f 100644 --- a/js-data/js-data-tests.ts +++ b/js-data/js-data-tests.ts @@ -127,7 +127,7 @@ interface IComment { profile?: any; } -var aComment:JSData_.DSResourceDefinition = store.defineResource('comment'); +var aComment:JSData.DSResourceDefinition = store.defineResource('comment'); // Get all comments where comment.userId == 5 aComment.filter({ @@ -276,7 +276,7 @@ interface IPost { } -var Post:JSData_.DSResourceDefinition; +var Post:JSData.DSResourceDefinition; // Grab the first "page" of posts Post.filter({ @@ -426,7 +426,7 @@ User.create({name: 'John'}, { module CustomAdapterTest { - class MyCustomAdapter implements JSData_.IDSAdapter { + class MyCustomAdapter implements JSData.IDSAdapter { // All of the methods shown here must return a promise @@ -437,52 +437,52 @@ module CustomAdapterTest { // was passed into the DS method that is calling // the adapter method - create(definition:JSData_.DSResourceDefinition, attrs:Object, options:JSData_.DSConfiguration):JSData_.JSDataPromise { + create(definition:JSData.DSResourceDefinition, attrs:Object, options:JSData.DSConfiguration):JSData.JSDataPromise { // Must resolve the promise with the created item - var promise:JSData_.JSDataPromise; + var promise:JSData.JSDataPromise; return promise; } - find(definition:JSData_.DSResourceDefinition, id:any, options:JSData_.DSConfiguration):JSData_.JSDataPromise { + find(definition:JSData.DSResourceDefinition, id:any, options:JSData.DSConfiguration):JSData.JSDataPromise { // Must resolve the promise with the found item - var promise:JSData_.JSDataPromise; + var promise:JSData.JSDataPromise; return promise; } - findAll(definition:JSData_.DSResourceDefinition, params:JSData_.DSFilterParams, options:JSData_.DSConfiguration):JSData_.JSDataPromise { + findAll(definition:JSData.DSResourceDefinition, params:JSData.DSFilterParams, options:JSData.DSConfiguration):JSData.JSDataPromise { // Must resolve the promise with the found items - var promise:JSData_.JSDataPromise; + var promise:JSData.JSDataPromise; return promise; } - update(definition:JSData_.DSResourceDefinition, id:any, attrs:Object, options:JSData_.DSConfiguration):JSData_.JSDataPromise { + update(definition:JSData.DSResourceDefinition, id:any, attrs:Object, options:JSData.DSConfiguration):JSData.JSDataPromise { // Must resolve the promise with the updated items - var promise:JSData_.JSDataPromise; + var promise:JSData.JSDataPromise; return promise; } - updateAll(definition:JSData_.DSResourceDefinition, attrs:Object, params:JSData_.DSFilterParams, options:JSData_.DSConfiguration):JSData_.JSDataPromise { + updateAll(definition:JSData.DSResourceDefinition, attrs:Object, params:JSData.DSFilterParams, options:JSData.DSConfiguration):JSData.JSDataPromise { // Must resolve the promise with the updated items - var promise:JSData_.JSDataPromise; + var promise:JSData.JSDataPromise; return promise; } - destroy(definition:JSData_.DSResourceDefinition, id:any, options:JSData_.DSConfiguration):JSData_.JSDataPromise { + destroy(definition:JSData.DSResourceDefinition, id:any, options:JSData.DSConfiguration):JSData.JSDataPromise { // Must return a promise - var promise:JSData_.JSDataPromise; + var promise:JSData.JSDataPromise; return promise; } - destroyAll(definition:JSData_.DSResourceDefinition, params:JSData_.DSFilterParams, options:JSData_.DSConfiguration):JSData_.JSDataPromise { + destroyAll(definition:JSData.DSResourceDefinition, params:JSData.DSFilterParams, options:JSData.DSConfiguration):JSData.JSDataPromise { // Must return a promise - var promise:JSData_.JSDataPromise; + var promise:JSData.JSDataPromise; return promise; } } @@ -500,14 +500,14 @@ module CustomAdapterTest { interface MyCustomDataStore { - myResource: JSData_.DSResourceDefinition + myResource: JSData.DSResourceDefinition } interface MyResourceDefinition { } -module JSData_ { +module JSData { interface DS { diff --git a/js-data/js-data.d.ts b/js-data/js-data.d.ts index b7271c4e2..cf74b6b79 100644 --- a/js-data/js-data.d.ts +++ b/js-data/js-data.d.ts @@ -14,7 +14,7 @@ /////////////////////////////////////////////////////////////////////////////// // defining what exists in JSData and how it looks -declare module JSData_ { +declare module JSData { interface JSDataPromise extends Promise { @@ -398,8 +398,8 @@ declare module JSData_ { // declaring the existing global js object declare var JSData:{ - DS: JSData_.DS; - DSErrors: JSData_.DSErrors; + DS: JSData.DS; + DSErrors: JSData.DSErrors; }; //Support node require