Skip to content

Commit 6edbed9

Browse files
author
Vladimir Upirov
authored
Merge pull request #113 from Backendless/vupirov/umdBuild
UMD Build
2 parents 428a123 + 50c608a commit 6edbed9

File tree

7 files changed

+44
-27
lines changed

7 files changed

+44
-27
lines changed

‎backendless.d.ts‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
declare module __Backendless {
66
import Backendless = __Backendless;
77

8+
var debugMode:boolean;
89
var serverURL:string;
910
var applicationId:string;
1011
var secretKey:string;
@@ -19,7 +20,7 @@ declare module __Backendless {
1920
/**
2021
* @dictionary
2122
*/
22-
var PublishOptionsHeaders:{ [key: string]: string; };
23+
var PublishOptionsHeaders:{ [key:string]:string; };
2324

2425

2526
/**
@@ -105,7 +106,7 @@ declare module __Backendless {
105106
* @constructor
106107
*/
107108
class Async {
108-
constructor(onSuccess?:(data?:Object) => void, onError?:((data:Object) => void) | Object, context?:Object);
109+
constructor(onSuccess?:(data?:Object) => void, onError?:((data:Object) => void)|Object, context?:Object);
109110

110111
success(data:Object):void;
111112

@@ -224,7 +225,7 @@ declare module __Backendless {
224225
*/
225226
class GeoCluster extends Backendless.GeoPoint {
226227
totalPoints:number;
227-
geoQuery:Backendless.GeoQuery | Backendless.RectangleGeoQueryI | Backendless.CircleGeoQueryI;
228+
geoQuery:Backendless.GeoQuery|Backendless.RectangleGeoQueryI|Backendless.CircleGeoQueryI;
228229
}
229230

230231
/**
@@ -322,7 +323,7 @@ declare module __Backendless {
322323
class Proxy {
323324
eventHandlers:Object;
324325

325-
on(eventName:string, handler:(data:any)=>any):void;
326+
on(eventName:string, handler:(data:any) => any):void;
326327

327328
fireEvent(eventName:string, data:any):void;
328329
}
@@ -830,23 +831,23 @@ declare module __Backendless {
830831
}
831832

832833
interface PersistencePermissionI {
833-
grantUserSync(userId: string, dataItem: Backendless.ExistDataItemI): Backendless.ExistDataItemI;
834-
grantUser(userId: string, dataItem: ExistDataItemI): Promise<Backendless.ExistDataItemI>;
834+
grantUserSync(userId:string, dataItem:Backendless.ExistDataItemI):Backendless.ExistDataItemI;
835+
grantUser(userId:string, dataItem:ExistDataItemI):Promise<Backendless.ExistDataItemI>;
835836

836-
grantRoleSync(roleName: string, dataItem: Backendless.ExistDataItemI): Backendless.ExistDataItemI;
837-
grantRole(roleName: string, dataItem: Backendless.ExistDataItemI): Promise<Backendless.ExistDataItemI>;
837+
grantRoleSync(roleName:string, dataItem:Backendless.ExistDataItemI):Backendless.ExistDataItemI;
838+
grantRole(roleName:string, dataItem:Backendless.ExistDataItemI):Promise<Backendless.ExistDataItemI>;
838839

839-
grantSync(dataItem: Backendless.ExistDataItemI): Backendless.ExistDataItemI;
840-
grant(dataItem: Backendless.ExistDataItemI): Promise<Backendless.ExistDataItemI>;
840+
grantSync(dataItem:Backendless.ExistDataItemI):Backendless.ExistDataItemI;
841+
grant(dataItem:Backendless.ExistDataItemI):Promise<Backendless.ExistDataItemI>;
841842

842-
denyUserSync(userId: string, dataItem: Backendless.ExistDataItemI): Backendless.ExistDataItemI;
843-
denyUser(userId: string, dataItem: Backendless.ExistDataItemI): Promise<Backendless.ExistDataItemI>;
843+
denyUserSync(userId:string, dataItem:Backendless.ExistDataItemI):Backendless.ExistDataItemI;
844+
denyUser(userId:string, dataItem:Backendless.ExistDataItemI):Promise<Backendless.ExistDataItemI>;
844845

845-
denyRoleSync(roleName: string, dataItem: Backendless.ExistDataItemI): Backendless.ExistDataItemI;
846-
denyRole(roleName: string, dataItem: Backendless.ExistDataItemI): Promise<Backendless.ExistDataItemI>;
846+
denyRoleSync(roleName:string, dataItem:Backendless.ExistDataItemI):Backendless.ExistDataItemI;
847+
denyRole(roleName:string, dataItem:Backendless.ExistDataItemI):Promise<Backendless.ExistDataItemI>;
847848

848-
denySync(dataItem: Backendless.ExistDataItemI): Backendless.ExistDataItemI;
849-
deny(dataItem: Backendless.ExistDataItemI): Promise<Backendless.ExistDataItemI>;
849+
denySync(dataItem:Backendless.ExistDataItemI):Backendless.ExistDataItemI;
850+
deny(dataItem:Backendless.ExistDataItemI):Promise<Backendless.ExistDataItemI>;
850851
}
851852

852853
interface FilePermissionI {
@@ -927,6 +928,7 @@ declare module __Backendless {
927928
subscriptionId:string;
928929
restUrl:string;
929930
proxy:Proxy;
931+
930932
cancelSubscription():void;
931933
}
932934

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,22 @@
6868
"chai": "^3.5.0",
6969
"chai-as-promised": "^6.0.0",
7070
"copyfiles": "^1.1.0",
71-
"cross-env": "^5.0.5",
71+
"cross-env": "^5.1.0",
7272
"eslint": "^3.12.2",
73-
"karma": "^1.3.0",
73+
"karma": "^1.7.1",
7474
"karma-babel-preprocessor": "^6.0.1",
7575
"karma-browserify": "^5.1.0",
7676
"karma-mocha": "^1.3.0",
7777
"karma-phantomjs-launcher": "^1.0.2",
7878
"mocha": "^3.2.0",
79-
"rimraf": "^2.5.4",
80-
"typescript": "^2.0.3",
81-
"uglify-js": "^3.0.15",
79+
"rimraf": "^2.6.2",
80+
"typescript": "^2.5.3",
81+
"uglify-js": "^3.1.4",
8282
"watch": "^1.0.2",
8383
"watchify": "^3.8.0",
84-
"webpack": "^3.5.5"
84+
"webpack": "^3.8.1"
8585
},
8686
"dependencies": {
87-
"backendless-request": "^0.0.9"
87+
"backendless-request": "^0.0.10"
8888
}
8989
}

‎src/cache/put.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export function put(key, value, timeToLive, asyncHandler) {
1313
timeToLive = undefined
1414
}
1515

16-
if (timeToLive && !Utils.isNumber(key)) {
16+
if (timeToLive && !Utils.isNumber(timeToLive)) {
1717
throw new Error('Cache timeToLive must be Number')
1818
}
1919

‎src/data/store/count.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export function getObjectCount(condition, asyncHandler) {
1111
}
1212

1313
if (condition instanceof DataQueryBuilder) {
14-
condition = condition.build().condition
14+
condition = condition.build().condition || undefined
1515
}
1616

1717
return Request.get({

‎src/request/request-for-browser.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ const sendRequest = config => {
5555
} else {
5656
const contentType = config.data ? 'application/json' : 'application/x-www-form-urlencoded'
5757

58+
if (contentType === 'application/json' && config.data && typeof config.data !== 'string') {
59+
config.data = JSON.stringify(config.data)
60+
}
61+
5862
xhr.setRequestHeader('Content-Type', contentType)
5963
}
6064

‎src/utils.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const Utils = {
2929
return Object.prototype.toString.call(obj).slice(8, -1) === 'Date'
3030
},
3131

32-
isBrowser: (new Function('try {return this===window;}catch(e){ return false;}'))(),
32+
isBrowser: isBrowser(),
3333

3434
castArray(value) {
3535
if (Utils.isArray(value)) {
@@ -184,6 +184,10 @@ const Utils = {
184184
}
185185
}
186186

187+
function isBrowser(){
188+
return (typeof self === 'object' && self.self === self) && (typeof window === 'object' && window === self)
189+
}
190+
187191
function classWrapper(obj) {
188192
//TODO: refactor it
189193
const wrapper = obj => {

‎webpack.config.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,16 @@ const uglify = new webpack.optimize.UglifyJsPlugin({
2323

2424
module.exports = {
2525
devtool: 'source-map',
26-
target : 'node',
26+
27+
target : 'web',
28+
29+
node: {
30+
Buffer: false
31+
},
2732

2833
module: {
34+
noParse: /backendless-request/,
35+
2936
rules: [
3037
{
3138
test : /\.js$/,

0 commit comments

Comments
 (0)