From a5faa31df82d7fe5e4d5ec8f39985a514d18bf7d Mon Sep 17 00:00:00 2001 From: Kayokwa Chibuye Date: Sat, 24 Dec 2016 10:17:05 +0200 Subject: [PATCH 1/2] Fixed bug - XMLHttpRequest status check --- src/pages/login/login.ts | 1 - src/pages/signup/signup.ts | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/login/login.ts b/src/pages/login/login.ts index 715ca92..6b210d1 100644 --- a/src/pages/login/login.ts +++ b/src/pages/login/login.ts @@ -56,7 +56,6 @@ export class LoginPage implements OnInit { self.nav.setRoot(TabsPage); }).catch(function (error) { // Handle Errors here. - var errorCode = error.code; var errorMessage = error.message; loader.dismiss().then(() => { let toast = self.toastCtrl.create({ diff --git a/src/pages/signup/signup.ts b/src/pages/signup/signup.ts index c6d6aff..408c198 100644 --- a/src/pages/signup/signup.ts +++ b/src/pages/signup/signup.ts @@ -89,7 +89,6 @@ export class SignupPage implements OnInit { }); }).catch(function (error) { // Handle Errors here. - var errorCode = error.code; var errorMessage = error.message; console.error(error); loader.dismiss().then(() => { @@ -112,8 +111,8 @@ export class SignupPage implements OnInit { xhr.open('GET', imageData, true); xhr.responseType = 'blob'; xhr.onload = function (e) { - if (this.status === 200) { - var myBlob = this.response; + if (xhr.status === 200) { + var myBlob = xhr.response; // myBlob is now the blob that the object URL pointed to. self.startUploading(myBlob); } From 54c080917614c6f38c8fb9fee3254852da5b0d74 Mon Sep 17 00:00:00 2001 From: Kayokwa N Chibuye Date: Sat, 24 Dec 2016 12:03:21 +0200 Subject: [PATCH 2/2] Updated/Fixed Ionic build * Updated package.json - ionic/app-scripts to v0.0.47 - typescript ^2.0.10 * Fixed Error - Cannot find module './app.module.ngfactory'. - deleted main.prod.ts - renamed main.dev.ts to main.ts --- package.json | 17 +++++++++-------- src/app/main.prod.ts | 7 ------- src/app/{main.dev.ts => main.ts} | 0 3 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 src/app/main.prod.ts rename src/app/{main.dev.ts => main.ts} (100%) diff --git a/package.json b/package.json index 59b5f3c..9da4736 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,6 @@ "run:before": "build" }, "dependencies": { - "ionic-native": "^2.0.3", - "ionicons": "^3.0.0", - "jquery": "^3.1.1", - "lodash": "^4.16.2", "@angular/common": "2.1.1", "@angular/compiler": "2.1.1", "@angular/compiler-cli": "2.1.1", @@ -27,11 +23,16 @@ "@angular/platform-browser-dynamic": "2.1.1", "@angular/platform-server": "2.1.1", "@ionic/storage": "1.1.6", - "ionic-angular": "2.0.0-rc.2" + "firebase": "^3.6.4", + "ionic-angular": "2.0.0-rc.2", + "ionic-native": "^2.0.3", + "ionicons": "^3.0.0", + "jquery": "^3.1.1", + "lodash": "^4.16.2" }, "devDependencies": { - "@ionic/app-scripts": "0.0.39", + "@ionic/app-scripts": "0.0.47", "@types/lodash": "4.14.36", - "typescript": "^2.0.3" + "typescript": "^2.0.10" } -} \ No newline at end of file +} diff --git a/src/app/main.prod.ts b/src/app/main.prod.ts deleted file mode 100644 index ec61e04..0000000 --- a/src/app/main.prod.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { platformBrowser } from '@angular/platform-browser'; -import { enableProdMode } from '@angular/core'; - -import { AppModuleNgFactory } from './app.module.ngfactory'; - -enableProdMode(); -platformBrowser().bootstrapModuleFactory(AppModuleNgFactory); diff --git a/src/app/main.dev.ts b/src/app/main.ts similarity index 100% rename from src/app/main.dev.ts rename to src/app/main.ts