From c79f76169e9d9b5ca98599a88ac6b1304e72fe33 Mon Sep 17 00:00:00 2001 From: Jermaine McFarlane Date: Sun, 10 Sep 2017 12:23:21 -0400 Subject: [PATCH 1/3] feat: upgrade dependencies update demo interface --- .gitignore | 1 + .gitmodules | 2 +- ionic.config.json | 3 +- package.json | 11 ++++--- src/ionic-tooltips | 2 +- src/pages/home/home.html | 63 +++++++++++++++++++++++----------------- src/pages/home/home.ts | 1 + 7 files changed, 48 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index c558400..a41aa26 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ plugins/android.json plugins/ios.json www/ $RECYCLE.BIN/ +typings/ .DS_Store Thumbs.db diff --git a/.gitmodules b/.gitmodules index 089b786..b933d08 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "src/ionic-tooltips"] path = src/ionic-tooltips - url = git@github.com:zyra/ionic-tooltips + url = git@github.com:jwelmac/ionic-tooltips.git diff --git a/ionic.config.json b/ionic.config.json index a1b1714..241e707 100644 --- a/ionic.config.json +++ b/ionic.config.json @@ -1,5 +1,6 @@ { "name": "ionic-tooltips-example", "app_id": "", - "type": "ionic-angular" + "type": "ionic-angular", + "integrations": {} } diff --git a/package.json b/package.json index 80beb06..e821853 100644 --- a/package.json +++ b/package.json @@ -21,19 +21,18 @@ "@angular/http": "4.1.3", "@angular/platform-browser": "4.1.3", "@angular/platform-browser-dynamic": "4.1.3", - "@ionic-native/core": "3.12.1", - "@ionic-native/splash-screen": "3.12.1", - "@ionic-native/status-bar": "3.12.1", + "@ionic-native/core": "4.2.1", + "@ionic-native/splash-screen": "4.2.1", + "@ionic-native/status-bar": "4.2.1", "@ionic/storage": "2.0.1", - "ionic-angular": "3.5.0", + "ionic-angular": "3.6.1", "ionicons": "3.0.0", "rxjs": "5.4.0", "sw-toolbox": "3.6.0", "zone.js": "0.8.12" }, "devDependencies": { - "@ionic/app-scripts": "1.3.12", - "@ionic/cli-plugin-ionic-angular": "1.3.1", + "@ionic/app-scripts": "2.1.4", "typescript": "2.3.4" }, "description": "A demo app demonstrating ionic-tooltips module" diff --git a/src/ionic-tooltips b/src/ionic-tooltips index 067d0e8..08f3723 160000 --- a/src/ionic-tooltips +++ b/src/ionic-tooltips @@ -1 +1 @@ -Subproject commit 067d0e8bd99ec031aaed4044e587e91b52a67959 +Subproject commit 08f3723c52a071e02ff158ae6c3e251a7ed14778 diff --git a/src/pages/home/home.html b/src/pages/home/home.html index 0c58070..266787c 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -12,46 +12,57 @@ + + Settings + + Show arrow + + + Set all active + + + + Show tooltip on +

+ + Click + Press + +

+ + + + + Duration + + + {{ duration + 'ms' }} + + + + + + + - - Show arrow - - - - Show tooltip on -

- - Click - Press - -

- - - Duration - - {{ duration + 'ms' }} - - - - - + Demo Buttons
-

-

- -
diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 25645dc..23dce87 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -9,5 +9,6 @@ export class HomePage { tooltipEvent: 'click' | 'press' = 'click'; showArrow: boolean = true; duration: number = 3000; + active: boolean = false; } From 65bb838cad9e556e0f86a8809554a0c12ab499da Mon Sep 17 00:00:00 2001 From: Jermaine McFarlane Date: Sun, 10 Sep 2017 17:15:54 -0400 Subject: [PATCH 2/3] feat: update to include all fixes --- .gitignore | 1 + src/app/app.component.ts | 4 ++-- src/app/app.module.ts | 11 ++++++----- src/index.html | 3 +++ src/ionic-tooltips | 2 +- src/pages/home/home.html | 13 +++++++++---- src/pages/home/home.module.ts | 20 ++++++++++++++++++++ src/pages/home/home.scss | 4 +++- src/pages/home/home.ts | 5 +++++ 9 files changed, 50 insertions(+), 13 deletions(-) create mode 100644 src/pages/home/home.module.ts diff --git a/.gitignore b/.gitignore index a41aa26..6573517 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ log.txt .vscode/ npm-debug.log* +.sourcemaps .idea/ .sass-cache/ .tmp/ diff --git a/src/app/app.component.ts b/src/app/app.component.ts index ab78376..f598d57 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -3,12 +3,12 @@ import { Platform } from 'ionic-angular'; import { StatusBar } from '@ionic-native/status-bar'; import { SplashScreen } from '@ionic-native/splash-screen'; -import { HomePage } from '../pages/home/home'; +// import { HomePage } from '../pages/home/home'; @Component({ templateUrl: 'app.html' }) export class MyApp { - rootPage:any = HomePage; + rootPage:any = 'home'; constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen) { platform.ready().then(() => { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 96888a4..c5e3005 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,24 +5,25 @@ import { SplashScreen } from '@ionic-native/splash-screen'; import { StatusBar } from '@ionic-native/status-bar'; import { MyApp } from './app.component'; -import { HomePage } from '../pages/home/home'; +// import { HomePage } from '../pages/home/home'; -import { TooltipsModule } from '../ionic-tooltips/src'; +// import { TooltipsModule } from '../ionic-tooltips/src'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @NgModule({ declarations: [ MyApp, - HomePage + // HomePage ], imports: [ BrowserModule, IonicModule.forRoot(MyApp), - TooltipsModule + BrowserAnimationsModule ], bootstrap: [IonicApp], entryComponents: [ MyApp, - HomePage + // HomePage ], providers: [ StatusBar, diff --git a/src/index.html b/src/index.html index 58c8942..0453704 100644 --- a/src/index.html +++ b/src/index.html @@ -34,6 +34,9 @@ + + + diff --git a/src/ionic-tooltips b/src/ionic-tooltips index 08f3723..e8206b3 160000 --- a/src/ionic-tooltips +++ b/src/ionic-tooltips @@ -1 +1 @@ -Subproject commit 08f3723c52a071e02ff158ae6c3e251a7ed14778 +Subproject commit e8206b3fcde9070b6e6662378831da4c62f5fd69 diff --git a/src/pages/home/home.html b/src/pages/home/home.html index 266787c..eff8623 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -27,6 +27,7 @@ Click Press + Hover

@@ -43,26 +44,30 @@ + + Tooltip Text + + Demo Buttons
-

-

- -
diff --git a/src/pages/home/home.module.ts b/src/pages/home/home.module.ts new file mode 100644 index 0000000..3f831c0 --- /dev/null +++ b/src/pages/home/home.module.ts @@ -0,0 +1,20 @@ +import { TooltipsChildModule } from './../../ionic-tooltips/src/tooltips.child.module'; +import { CommonModule } from '@angular/common'; +import { HomePage } from './home'; +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; + +@NgModule({ + declarations: [ + HomePage, + ], + imports: [ + CommonModule, + IonicPageModule.forChild(HomePage), + TooltipsChildModule + ], + exports: [ + HomePage + ] +}) +export class HomePageModule {} \ No newline at end of file diff --git a/src/pages/home/home.scss b/src/pages/home/home.scss index d4cc8fc..ef70c2b 100644 --- a/src/pages/home/home.scss +++ b/src/pages/home/home.scss @@ -1,3 +1,5 @@ page-home { - + .scroll-content { + padding-bottom: 30px; + } } diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 23dce87..25f5b1a 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -1,5 +1,9 @@ import { Component } from '@angular/core'; +import { IonicPage } from 'ionic-angular'; +@IonicPage({ + name: 'home' +}) @Component({ selector: 'page-home', templateUrl: 'home.html' @@ -10,5 +14,6 @@ export class HomePage { showArrow: boolean = true; duration: number = 3000; active: boolean = false; + tooltipText: string = "I'm a beautiful tooltip"; } From f3e8df963f79d175ab2dd437d2a1f6c2d4f6c29b Mon Sep 17 00:00:00 2001 From: Jermaine McFarlane Date: Mon, 11 Sep 2017 12:25:28 -0400 Subject: [PATCH 3/3] chore: update submodule, exclude test file --- .gitmodules | 2 +- src/ionic-tooltips | 2 +- src/pages/home/home.module.ts | 4 ++-- tsconfig.json | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index b933d08..adbd452 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "src/ionic-tooltips"] path = src/ionic-tooltips - url = git@github.com:jwelmac/ionic-tooltips.git + url = https://github.com/zyra/ionic-tooltips.git diff --git a/src/ionic-tooltips b/src/ionic-tooltips index e8206b3..6381ba1 160000 --- a/src/ionic-tooltips +++ b/src/ionic-tooltips @@ -1 +1 @@ -Subproject commit e8206b3fcde9070b6e6662378831da4c62f5fd69 +Subproject commit 6381ba13dcecd8bf0dcf9dcff712cd7daaa7e674 diff --git a/src/pages/home/home.module.ts b/src/pages/home/home.module.ts index 3f831c0..192dc86 100644 --- a/src/pages/home/home.module.ts +++ b/src/pages/home/home.module.ts @@ -1,4 +1,4 @@ -import { TooltipsChildModule } from './../../ionic-tooltips/src/tooltips.child.module'; +import { TooltipsModule } from './../../ionic-tooltips/src'; import { CommonModule } from '@angular/common'; import { HomePage } from './home'; import { NgModule } from '@angular/core'; @@ -11,7 +11,7 @@ import { IonicPageModule } from 'ionic-angular'; imports: [ CommonModule, IonicPageModule.forChild(HomePage), - TooltipsChildModule + TooltipsModule ], exports: [ HomePage diff --git a/tsconfig.json b/tsconfig.json index 2e450f9..f9695c9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,7 +17,8 @@ "src/**/*.ts" ], "exclude": [ - "node_modules" + "node_modules", + "src/**/*.spec.ts" ], "compileOnSave": false, "atom": {