github/awesome-cordova-plugins
github/awesome-cordova-plugins
2
0
Fork 1
mirror of https://github.com/danielsogl/awesome-cordova-plugins.git synced 2025-01-19 16:52:53 +08:00
Code Issues Projects Releases Wiki Activity

perf(ionicnative): instance wrapper cleanup and optimization

Browse Source
This commit is contained in:
Ibrahim Hadeed 2016-03-29 17:49:53 -04:00
parent 0ec737aa49
commit 5a8d48ea36
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/plugin.ts
View File

@ -7,6 +7,7 @@ declare var Promise;
declare var $q; declare var $q;
import {Observable} from 'rxjs/Observable'; import {Observable} from 'rxjs/Observable';
import sys = ts.sys;
/** /**
* @private * @private
@ -150,30 +151,31 @@ function wrapObservable(pluginObj:any, methodName:string, args:any[], opts:any =
} }
function callInstance(pluginObj:any, methodName : string, args:any[], opts:any = {}, resolve? : Function, reject? : Function){ function callInstance(pluginObj:any, methodName : string, args:any[], opts:any = {}, resolve? : Function, reject? : Function){
console.log("C", methodName); if(!systemCheck(getPlugin(pluginObj), pluginObj, methodName, resolve, reject)) return;
args = setIndex(args); args = setIndex(args);
console.log("D", methodName, pluginObj, pluginObj._objectInstance);
return pluginObj._objectInstance[methodName].apply(pluginObj._objectInstance, args); return pluginObj._objectInstance[methodName].apply(pluginObj._objectInstance, args);
} }
function wrapInstance (pluginObj:any, methodName:string, args:any[], opts:any = {}){ function wrapInstance (pluginObj:any, methodName:string, args:any[], opts:any = {}){
if (opts.sync) { if (opts.sync) {
return callInstance(pluginObj, methodName, args, opts); return callInstance(pluginObj, methodName, args, opts);
} else if (opts.observable) { } else if (opts.observable) {
//console.log("It's an observable");
return new Observable(observer => { return new Observable(observer => {
//args = setIndex(args); let pluginResult = callInstance(pluginObj, methodName,args, opts, observer.next.bind(observer), observer.error.bind(observer));
callInstance(pluginObj, methodName,args, opts, observer.next.bind(observer), observer.error.bind(observer)); return () => {
return () => { try {
console.log("Observer cancelled."); if (opts.clearWithArgs){
return pluginObj._objectInstance[opts.clearFunction].apply(pluginObj._objectInstance, args);
}
return pluginObj._objectInstance[opts.clearFunction].call(pluginObj, pluginResult);
} catch(e) {
console.warn('Unable to clear the previous observable watch for', pluginObj.name, methodName);
console.error(e);
} }
}
}); });
} else { } else {
console.log("B", methodName);
return getPromise((resolve, reject) => { return getPromise((resolve, reject) => {
//args = setIndex(args);
callInstance(pluginObj, methodName, args, opts, resolve, reject); callInstance(pluginObj, methodName, args, opts, resolve, reject);
}); });
} }
@ -202,9 +204,7 @@ function wrapEventObservable (event : string) : Observable<any> {
export const wrap = function(pluginObj:any, methodName:string, opts:any = {}) { export const wrap = function(pluginObj:any, methodName:string, opts:any = {}) {
return (...args) => { return (...args) => {
if(opts.instanceMethod) { if (opts.sync)
return wrapInstance(pluginObj, methodName, args, opts);
} else if (opts.sync)
return callCordovaPlugin(pluginObj, methodName, args, opts); return callCordovaPlugin(pluginObj, methodName, args, opts);
else if (opts.observable) else if (opts.observable)
@ -271,16 +271,16 @@ export function Cordova(opts:any = {}) {
} }
} }
/**
* @private
*
* Wrap an instance method
*/
export function CordovaInstance(opts:any = {}) { export function CordovaInstance(opts:any = {}) {
return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => { return (target: Object, methodName: string) => {
//let originalMethod = descriptor.value;
opts['instanceMethod'] = true;
return { return {
value: function(...args: any[]) { value: function(...args: any[]) {
console.log("A", methodName); return wrapInstance(this, methodName, opts).apply(this, args);
return wrap(this, methodName, opts).apply(this, args);
} }
} }
} }