From af5b3de227661bcea0006341d4d4d02f21e86050 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Sun, 29 Nov 2015 21:50:58 -0600 Subject: [PATCH] :derp: --- demo/www/app/home/home.js | 4 +++- dist/index.d.ts | 4 ---- dist/index.js | 8 ++++---- dist/plugins/plugin.js | 5 ++++- dist/plugins/toast.js | 4 +++- dist/src/index.d.ts | 4 ---- dist/src/index.js | 4 ---- dist/src/plugins/plugin.js | 5 ++++- dist/src/plugins/toast.js | 4 +++- src/index.ts | 8 ++++---- src/plugins/plugin.ts | 6 +++++- src/plugins/toast.ts | 4 +++- 12 files changed, 33 insertions(+), 27 deletions(-) diff --git a/demo/www/app/home/home.js b/demo/www/app/home/home.js index e53e5b1a..bbf306f8 100644 --- a/demo/www/app/home/home.js +++ b/demo/www/app/home/home.js @@ -23,7 +23,9 @@ export class HomePage { Device, StatusBar, Toast - ]; + ].filter((p) => { + return !!p; + }); console.log('PLUGINS', this.plugins); } diff --git a/dist/index.d.ts b/dist/index.d.ts index 087d76f2..e2d46fc3 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,5 +1 @@ -export * from './plugins/actionsheet'; -export * from './plugins/camera'; -export * from './plugins/device'; -export * from './plugins/statusbar'; export * from './plugins/toast'; diff --git a/dist/index.js b/dist/index.js index 955757b4..5c1cece2 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2,10 +2,10 @@ function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } var DEVICE_READY_TIMEOUT = 2000; -__export(require('./plugins/actionsheet')); -__export(require('./plugins/camera')); -__export(require('./plugins/device')); -__export(require('./plugins/statusbar')); +//export * from './plugins/actionsheet'; +//export * from './plugins/camera'; +//export * from './plugins/device'; +//export * from './plugins/statusbar'; __export(require('./plugins/toast')); var didFireReady = false; window.addEventListener('deviceready', function () { diff --git a/dist/plugins/plugin.js b/dist/plugins/plugin.js index 432348bc..706a07ba 100644 --- a/dist/plugins/plugin.js +++ b/dist/plugins/plugin.js @@ -25,11 +25,13 @@ exports.cordovaWarn = function (pluginName, method) { }; exports.wrap = function (pluginObj, methodName, opts) { if (opts === void 0) { opts = {}; } + console.log('Wrap', pluginObj.name, methodName); return function () { var args = []; for (var _i = 0; _i < arguments.length; _i++) { args[_i - 0] = arguments[_i]; } + console.log('Wrap CALLED', pluginObj.name, methodName, args); return new Promise(function (resolve, reject) { if (!window.cordova) { exports.cordovaWarn(pluginObj.name, methodName); @@ -64,6 +66,7 @@ exports.wrap = function (pluginObj, methodName, opts) { }); return; } + console.log('Cordova calling', pluginObj.name, methodName, args); util_1.get(window, pluginObj.pluginRef)[methodName].apply(pluginObj, args); }); }; @@ -95,7 +98,7 @@ function Cordova(opts) { for (var _i = 0; _i < arguments.length; _i++) { args[_i - 0] = arguments[_i]; } - return exports.wrap(this, methodName, opts)(); + return exports.wrap(this, methodName, opts).apply(this, args); } }; }; diff --git a/dist/plugins/toast.js b/dist/plugins/toast.js index aa523a4d..ec6d17e4 100644 --- a/dist/plugins/toast.js +++ b/dist/plugins/toast.js @@ -12,7 +12,9 @@ var Toast = (function () { } Toast.hide = function () { }; ; - Toast.showWithOptions = function (options) { }; + Toast.showWithOptions = function (options) { + console.log('Show with options'); + }; ; Object.defineProperty(Toast, "hide", __decorate([ diff --git a/dist/src/index.d.ts b/dist/src/index.d.ts index 68333def..f5e97ad0 100644 --- a/dist/src/index.d.ts +++ b/dist/src/index.d.ts @@ -1,5 +1 @@ -export * from './plugins/actionsheet'; -export * from './plugins/camera'; -export * from './plugins/device'; -export * from './plugins/statusbar'; export * from './plugins/toast'; diff --git a/dist/src/index.js b/dist/src/index.js index 0244dd08..7cf151e4 100644 --- a/dist/src/index.js +++ b/dist/src/index.js @@ -2,10 +2,6 @@ function __export(m) { for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; } var DEVICE_READY_TIMEOUT = 2000; -__export(require('./plugins/actionsheet')); -__export(require('./plugins/camera')); -__export(require('./plugins/device')); -__export(require('./plugins/statusbar')); __export(require('./plugins/toast')); var didFireReady = false; window.addEventListener('deviceready', function () { diff --git a/dist/src/plugins/plugin.js b/dist/src/plugins/plugin.js index 6f4432e5..6a7fab12 100644 --- a/dist/src/plugins/plugin.js +++ b/dist/src/plugins/plugin.js @@ -25,11 +25,13 @@ exports.cordovaWarn = function (pluginName, method) { }; exports.wrap = function (pluginObj, methodName, opts) { if (opts === void 0) { opts = {}; } + console.log('Wrap', pluginObj.name, methodName); return function () { var args = []; for (var _i = 0; _i < arguments.length; _i++) { args[_i - 0] = arguments[_i]; } + console.log('Wrap CALLED', pluginObj.name, methodName, args); return new Promise(function (resolve, reject) { if (!window.cordova) { exports.cordovaWarn(pluginObj.name, methodName); @@ -58,6 +60,7 @@ exports.wrap = function (pluginObj, methodName, opts) { }); return; } + console.log('Cordova calling', pluginObj.name, methodName, args); util_1.get(window, pluginObj.pluginRef)[methodName].apply(pluginObj, args); }); }; @@ -81,7 +84,7 @@ function Cordova(opts) { for (var _i = 0; _i < arguments.length; _i++) { args[_i - 0] = arguments[_i]; } - return exports.wrap(this, methodName, opts)(); + return exports.wrap(this, methodName, opts).apply(this, args); } }; }; diff --git a/dist/src/plugins/toast.js b/dist/src/plugins/toast.js index 7c889483..cb5eadc6 100644 --- a/dist/src/plugins/toast.js +++ b/dist/src/plugins/toast.js @@ -13,7 +13,9 @@ var Toast = (function () { } Toast.hide = function () { }; ; - Toast.showWithOptions = function (options) { }; + Toast.showWithOptions = function (options) { + console.log('Show with options'); + }; ; __decorate([ plugin_1.Cordova({ diff --git a/src/index.ts b/src/index.ts index 38cee229..c2ebc8ad 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,9 +1,9 @@ const DEVICE_READY_TIMEOUT = 2000; -export * from './plugins/actionsheet'; -export * from './plugins/camera'; -export * from './plugins/device'; -export * from './plugins/statusbar'; +//export * from './plugins/actionsheet'; +//export * from './plugins/camera'; +//export * from './plugins/device'; +//export * from './plugins/statusbar'; export * from './plugins/toast'; diff --git a/src/plugins/plugin.ts b/src/plugins/plugin.ts index ee840f72..55176462 100644 --- a/src/plugins/plugin.ts +++ b/src/plugins/plugin.ts @@ -28,7 +28,9 @@ export const cordovaWarn = function(pluginName: string, method: string) { } export const wrap = function(pluginObj, methodName, opts: any = {}) { + console.log('Wrap', pluginObj.name, methodName); return (...args) => { + console.log('Wrap CALLED', pluginObj.name, methodName, args); return new Promise((resolve, reject) => { if(!window.cordova) { @@ -67,6 +69,8 @@ export const wrap = function(pluginObj, methodName, opts: any = {}) { return; } + console.log('Cordova calling', pluginObj.name, methodName, args); + get(window, pluginObj.pluginRef)[methodName].apply(pluginObj, args); }) } @@ -97,7 +101,7 @@ export function Cordova(opts:any = {}) { return { value: function(...args: any[]) { - return wrap(this, methodName, opts)(); + return wrap(this, methodName, opts).apply(this, args); } } } diff --git a/src/plugins/toast.ts b/src/plugins/toast.ts index 36cdd553..d67113e1 100644 --- a/src/plugins/toast.ts +++ b/src/plugins/toast.ts @@ -17,5 +17,7 @@ export class Toast { successIndex: 1, errIndex: 2 }) - static showWithOptions(options:any){}; + static showWithOptions(options:any){ + console.log('Show with options'); + }; }