Add support for cordova SQLite plugin to use plugin outside of the gl…

…obal scope, passed in via argument
microsoft · Jan 11, 2016 · 388457d · 388457d
1 parent a467efd
commit 388457d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/dist/CordovaNativeSqliteProvider.d.ts b/dist/CordovaNativeSqliteProvider.d.ts
@@ -10,7 +10,7 @@ import NoSqlProvider = require('./NoSqlProviderInterfaces');
 import SqlProviderBase = require('./SqlProviderBase');
 export declare class CordovaNativeSqliteProvider extends SqlProviderBase.SqlProviderBase {
     private _db;
-    open(dbName: string, schema: NoSqlProvider.DbSchema, wipeIfExists: boolean, verbose: boolean): SyncTasks.Promise<void>;
+    open(dbName: string, schema: NoSqlProvider.DbSchema, wipeIfExists: boolean, verbose: boolean, plugin?: SqlitePlugin): SyncTasks.Promise<void>;
     close(): SyncTasks.Promise<void>;
     openTransaction(storeNames: string | string[], writeNeeded: boolean): SyncTasks.Promise<SqlProviderBase.SqlTransaction>;
 }
diff --git a/dist/CordovaNativeSqliteProvider.js b/dist/CordovaNativeSqliteProvider.js
@@ -18,15 +18,16 @@ var CordovaNativeSqliteProvider = (function (_super) {
     function CordovaNativeSqliteProvider() {
         _super.apply(this, arguments);
     }
-    CordovaNativeSqliteProvider.prototype.open = function (dbName, schema, wipeIfExists, verbose) {
+    CordovaNativeSqliteProvider.prototype.open = function (dbName, schema, wipeIfExists, verbose, plugin) {
+        if (plugin === void 0) { plugin = window.sqlitePlugin; }
         _super.prototype.open.call(this, dbName, schema, wipeIfExists, verbose);
-        if (!window.sqlitePlugin || !window.sqlitePlugin.openDatabase) {
+        if (!plugin || !plugin.openDatabase) {
             return SyncTasks.Rejected('No support for native sqlite in this browser');
         }
         if (typeof (navigator) !== 'undefined' && navigator.userAgent.indexOf('Mobile Crosswalk') !== -1) {
             return SyncTasks.Rejected('Android NativeSqlite is broken, skipping');
         }
-        this._db = window.sqlitePlugin.openDatabase({
+        this._db = plugin.openDatabase({
             name: dbName + '.db',
             location: 2,
             androidDatabaseImplementation: 2,

diff --git a/src/CordovaNativeSqliteProvider.ts b/src/CordovaNativeSqliteProvider.ts
@@ -14,18 +14,19 @@ import SqlProviderBase = require('./SqlProviderBase');
 // The DbProvider implementation for Native Sqlite on cordova
 export class CordovaNativeSqliteProvider extends SqlProviderBase.SqlProviderBase {
     private _db: SqliteDatabase;
-    open(dbName: string, schema: NoSqlProvider.DbSchema, wipeIfExists: boolean, verbose: boolean): SyncTasks.Promise<void> {
+    open(dbName: string, schema: NoSqlProvider.DbSchema, wipeIfExists: boolean, verbose: boolean,
+        plugin: SqlitePlugin = window.sqlitePlugin): SyncTasks.Promise<void> {
         super.open(dbName, schema, wipeIfExists, verbose);
 
-        if (!window.sqlitePlugin || !window.sqlitePlugin.openDatabase) {
+        if (!plugin || !plugin.openDatabase) {
             return SyncTasks.Rejected<void>('No support for native sqlite in this browser');
         }
 
         if (typeof (navigator) !== 'undefined' && navigator.userAgent.indexOf('Mobile Crosswalk') !== -1) {
             return SyncTasks.Rejected<void>('Android NativeSqlite is broken, skipping');
         }
 
-        this._db = window.sqlitePlugin.openDatabase({
+        this._db = plugin.openDatabase({
             name: dbName + '.db',
             location: 2,
             androidDatabaseImplementation: 2,