From 65e368af2051693656df093ad31b93bcd8855975 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 11 Dec 2018 12:20:26 +0100 Subject: [PATCH] MOBILE-2777 core: Use new version of keyboard plugin --- config.xml | 2 +- package-lock.json | 139 ++++++++++++++++++--------------------- package.json | 12 ++-- src/app/app.component.ts | 8 +-- src/providers/app.ts | 2 +- 5 files changed, 77 insertions(+), 86 deletions(-) diff --git a/config.xml b/config.xml index 3bf248381..48a6e113a 100644 --- a/config.xml +++ b/config.xml @@ -110,7 +110,7 @@ - + diff --git a/package-lock.json b/package-lock.json index f84e5c485..a78e759b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -156,9 +156,9 @@ "integrity": "sha512-iEOSyhpxj0btN5S9x86+/d2Zq28OxnNvP/jqOADZnolAdVeyDuDg6dORUbywoCGAf5PKUOXDbOFKGdyJAEV5EA==" }, "@ionic-native/keyboard": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-4.14.0.tgz", - "integrity": "sha512-VH+Fko7b8LtkmrpzTZHOzT35WFXdSo036uW/DVA/TuZHqQzo0h4Kc+kiwS5IMB2PNy6k0lKkSoFMn3IKMpRyTg==" + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-4.17.0.tgz", + "integrity": "sha512-2BHO1bV4mehWZNfdsWQ/uojxYFNvk4I6u0KYnNb61RiJRY83joCEw3oFkOMRGLZthPf6TN1cueZUIAGMHXA3nA==" }, "@ionic-native/local-notifications": { "version": "4.5.2", @@ -1940,18 +1940,46 @@ "integrity": "sha512-WTGxyQJYsgmll8wDEo0u4XevZDUH1ZH1VPoOwwNkQ8YOtCNQS8gRIIVtZ70Kan+Vo+CiUMV0oJXdNAdARb8JwQ==" }, "cordova-ios": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-4.5.4.tgz", - "integrity": "sha1-yAZIBYlyloVw3BXalzFP+S0H3+c=", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-4.5.5.tgz", + "integrity": "sha512-3+30m2dZ2yii7kg+H7cgpdpkXpMj54zoX5imjGGG4Z7dPXKmalTLc/9rLq+Iaa+Q1BqyOrUFaHopWOODRU6vCg==", "requires": { - "cordova-common": "2.1.0", - "ios-sim": "^6.1.2", - "nopt": "^3.0.6", - "plist": "^1.2.0", - "q": "^1.4.1", - "shelljs": "^0.5.3", - "xcode": "^0.9.0", - "xml-escape": "^1.1.0" + "abbrev": "*", + "ansi": "*", + "balanced-match": "*", + "base64-js": "1.2.0", + "big-integer": "*", + "bplist-creator": "*", + "bplist-parser": "*", + "brace-expansion": "*", + "concat-map": "*", + "cordova-common": "2.2.5", + "cordova-registry-mapper": "*", + "elementtree": "0.1.6", + "glob": "5.0.15", + "inflight": "*", + "inherits": "*", + "ios-sim": "6.1.3", + "minimatch": "*", + "nopt": "3.0.6", + "once": "*", + "path-is-absolute": "*", + "plist": "2.1.0", + "q": "1.5.1", + "sax": "0.3.5", + "shelljs": "0.5.3", + "simctl": "*", + "simple-plist": "0.2.1", + "stream-buffers": "2.2.0", + "tail": "0.4.0", + "underscore": "*", + "unorm": "*", + "uuid": "3.0.1", + "wrappy": "*", + "xcode": "0.9.3", + "xml-escape": "1.1.0", + "xmlbuilder": "8.2.2", + "xmldom": "*" }, "dependencies": { "abbrev": { @@ -1967,11 +1995,11 @@ "bundled": true }, "base64-js": { - "version": "0.0.8", + "version": "1.2.0", "bundled": true }, "big-integer": { - "version": "1.6.25", + "version": "1.6.32", "bundled": true }, "bplist-creator": { @@ -1989,7 +2017,7 @@ } }, "brace-expansion": { - "version": "1.1.8", + "version": "1.1.11", "bundled": true, "requires": { "balanced-match": "^1.0.0", @@ -2001,7 +2029,7 @@ "bundled": true }, "cordova-common": { - "version": "2.1.0", + "version": "2.2.5", "bundled": true, "requires": { "ansi": "^0.3.1", @@ -2010,10 +2038,8 @@ "elementtree": "0.1.6", "glob": "^5.0.13", "minimatch": "^3.0.0", - "osenv": "^0.1.3", - "plist": "^1.2.0", + "plist": "^2.1.0", "q": "^1.4.1", - "semver": "^5.0.1", "shelljs": "^0.5.3", "underscore": "^1.8.3", "unorm": "^1.3.3" @@ -2054,12 +2080,12 @@ "bundled": true }, "ios-sim": { - "version": "6.1.2", + "version": "6.1.3", "bundled": true, "requires": { "bplist-parser": "^0.0.6", "nopt": "1.0.9", - "plist": "^1.2.0", + "plist": "^2.1.0", "simctl": "^1.1.1" }, "dependencies": { @@ -2076,10 +2102,6 @@ } } }, - "lodash": { - "version": "3.10.1", - "bundled": true - }, "minimatch": { "version": "3.0.4", "bundled": true, @@ -2101,37 +2123,16 @@ "wrappy": "1" } }, - "os-homedir": { - "version": "1.0.2", - "bundled": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, "path-is-absolute": { "version": "1.0.1", "bundled": true }, - "pegjs": { - "version": "0.10.0", - "bundled": true - }, "plist": { - "version": "1.2.0", + "version": "2.1.0", "bundled": true, "requires": { - "base64-js": "0.0.8", - "util-deprecate": "1.0.2", - "xmlbuilder": "4.0.0", + "base64-js": "1.2.0", + "xmlbuilder": "8.2.2", "xmldom": "0.1.x" } }, @@ -2143,10 +2144,6 @@ "version": "0.3.5", "bundled": true }, - "semver": { - "version": "5.4.1", - "bundled": true - }, "shelljs": { "version": "0.5.3", "bundled": true @@ -2186,10 +2183,6 @@ "xmlbuilder": "8.2.2", "xmldom": "0.1.x" } - }, - "xmlbuilder": { - "version": "8.2.2", - "bundled": true } } }, @@ -2202,17 +2195,13 @@ "bundled": true }, "underscore": { - "version": "1.8.3", + "version": "1.9.1", "bundled": true }, "unorm": { "version": "1.4.1", "bundled": true }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true - }, "uuid": { "version": "3.0.1", "bundled": true @@ -2235,11 +2224,8 @@ "bundled": true }, "xmlbuilder": { - "version": "4.0.0", - "bundled": true, - "requires": { - "lodash": "^3.5.0" - } + "version": "8.2.2", + "bundled": true }, "xmldom": { "version": "0.1.27", @@ -2297,6 +2283,11 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-3.0.0.tgz", "integrity": "sha1-1K4A02Z2IQdRBXrSWK5K1KkWGto=" }, + "cordova-plugin-ionic-keyboard": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.1.3.tgz", + "integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ==" + }, "cordova-plugin-local-notifications-mm": { "version": "1.0.13", "resolved": "https://registry.npmjs.org/cordova-plugin-local-notifications-mm/-/cordova-plugin-local-notifications-mm-1.0.13.tgz", @@ -5483,11 +5474,6 @@ "resolved": "https://registry.npmjs.org/ionic-angular/-/ionic-angular-3.9.2.tgz", "integrity": "sha512-BEZ6magY1i5GwM9ki/MOpszUz62+g518HsGICtw9TE1D4v9Eb6n/o7e+X0vtvpK4TdouFjQ8r5XA9VPAKW9/+Q==" }, - "ionic-plugin-keyboard": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ionic-plugin-keyboard/-/ionic-plugin-keyboard-2.2.1.tgz", - "integrity": "sha1-8qnhabvptVIkADR8n9bTRn7j+hI=" - }, "ionicons": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-3.0.0.tgz", @@ -7726,6 +7712,11 @@ "sha.js": "^2.4.8" } }, + "pegjs": { + "version": "0.10.0", + "resolved": "http://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz", + "integrity": "sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0=" + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", diff --git a/package.json b/package.json index 8c301c704..fab306032 100644 --- a/package.json +++ b/package.json @@ -58,15 +58,15 @@ "@ionic-native/file-transfer": "4.17.0", "@ionic-native/globalization": "4.17.0", "@ionic-native/in-app-browser": "4.17.0", - "@ionic-native/keyboard": "4.14.0", + "@ionic-native/keyboard": "4.17.0", "@ionic-native/local-notifications": "4.5.2", "@ionic-native/media-capture": "4.17.0", "@ionic-native/network": "4.17.0", "@ionic-native/push": "4.17.0", - "@ionic-native/screen-orientation": "^4.17.0", - "@ionic-native/splash-screen": "^4.17.0", + "@ionic-native/screen-orientation": "4.17.0", + "@ionic-native/splash-screen": "4.17.0", "@ionic-native/sqlite": "4.17.0", - "@ionic-native/status-bar": "^4.17.0", + "@ionic-native/status-bar": "4.17.0", "@ionic-native/web-intent": "4.17.0", "@ionic-native/zip": "4.17.0", "@ngx-translate/core": "^8.0.0", @@ -93,6 +93,7 @@ "cordova-plugin-file-transfer": "1.7.1", "cordova-plugin-globalization": "1.11.0", "cordova-plugin-inappbrowser": "3.0.0", + "cordova-plugin-ionic-keyboard": "2.1.3", "cordova-plugin-local-notifications-mm": "1.0.13", "cordova-plugin-media-capture": "3.0.2", "cordova-plugin-network-information": "2.0.1", @@ -105,7 +106,6 @@ "es6-promise-plugin": "^4.2.2", "font-awesome": "4.7.0", "ionic-angular": "^3.9.2", - "ionic-plugin-keyboard": "2.2.1", "ionicons": "3.0.0", "jszip": "^3.1.4", "moment": "^2.19.1", @@ -158,6 +158,7 @@ "cordova-plugin-file-transfer": {}, "cordova-plugin-globalization": {}, "cordova-plugin-inappbrowser": {}, + "cordova-plugin-ionic-keyboard": {}, "cordova-plugin-local-notifications-mm": {}, "cordova-plugin-media-capture": {}, "cordova-plugin-network-information": {}, @@ -167,7 +168,6 @@ "cordova-plugin-whitelist": {}, "cordova-plugin-zip": {}, "cordova-sqlite-evcore-extbuild-free": {}, - "ionic-plugin-keyboard": {}, "nl.kingsquare.cordova.background-audio": {}, "phonegap-plugin-push": { "SENDER_ID": "694767596569" diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0e425823a..a896c24d1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -35,9 +35,9 @@ export class MoodleMobileApp implements OnInit { protected lastUrls = {}; constructor(private platform: Platform, statusBar: StatusBar, logger: CoreLoggerProvider, keyboard: Keyboard, - private eventsProvider: CoreEventsProvider, private loginHelper: CoreLoginHelperProvider, private zone: NgZone, - private appProvider: CoreAppProvider, private langProvider: CoreLangProvider, private sitesProvider: CoreSitesProvider, - private screenOrientation: ScreenOrientation) { + private eventsProvider: CoreEventsProvider, private loginHelper: CoreLoginHelperProvider, private zone: NgZone, + private appProvider: CoreAppProvider, private langProvider: CoreLangProvider, private sitesProvider: CoreSitesProvider, + private screenOrientation: ScreenOrientation) { this.logger = logger.getInstance('AppComponent'); platform.ready().then(() => { @@ -49,7 +49,7 @@ export class MoodleMobileApp implements OnInit { statusBar.styleDefault(); } - keyboard.hideKeyboardAccessoryBar(false); + keyboard.hideFormAccessoryBar(false); }); } diff --git a/src/providers/app.ts b/src/providers/app.ts index d6c6d63d8..5ce82bf67 100644 --- a/src/providers/app.ts +++ b/src/providers/app.ts @@ -123,7 +123,7 @@ export class CoreAppProvider { */ closeKeyboard(): void { if (this.isMobile()) { - this.keyboard.close(); + this.keyboard.hide(); } }