diff --git a/App/Cordova_App.vstemplate b/App/Cordova_App.vstemplate index 06632dd4..29bea6cd 100644 --- a/App/Cordova_App.vstemplate +++ b/App/Cordova_App.vstemplate @@ -16,9 +16,6 @@ - - IPaths.ts - paths.ts @@ -30,6 +27,11 @@ wrapper.html + + + home.html + + platform.css platformOverrides.js @@ -42,6 +44,11 @@ wrapper.html + + + home.html + + platform.css platformOverrides.js @@ -97,9 +104,6 @@ tabs-module.ts - - fetch.json - diff --git a/App/constants/interfaces/IPaths.ts b/App/constants/interfaces/IPaths.ts deleted file mode 100644 index f6fac2aa..00000000 --- a/App/constants/interfaces/IPaths.ts +++ /dev/null @@ -1,24 +0,0 @@ -module Constants { - 'use strict'; - - export interface IPaths { - Core: string, - Modules: string, - Tabs: string, - Side?: { - Base: string, - Left?: string, - Right?: string - }, - Home: { - Base: string, - Scroll: string - }, - Actions: { - Base: string - }, - Buttons: { - Base: string - } - } -} diff --git a/App/constants/paths.ts b/App/constants/paths.ts index 2e7cca6f..131cf0e7 100644 --- a/App/constants/paths.ts +++ b/App/constants/paths.ts @@ -1,7 +1,7 @@ module Constants { 'use strict'; - export let Paths: IPaths = { + export let Paths = { Core: 'core', Modules: 'modules/', Tabs: 'tabs', diff --git a/App/merges/android/modules/home/views/home.html b/App/merges/android/modules/home/views/home.html new file mode 100644 index 00000000..6f0d8a51 --- /dev/null +++ b/App/merges/android/modules/home/views/home.html @@ -0,0 +1,20 @@ + + +
+ + +
+ +
+ Submit +
+
+
\ No newline at end of file diff --git a/App/merges/android/modules/tabs/templates/wrapper.html b/App/merges/android/modules/tabs/templates/wrapper.html index 3b2853ee..fc2f0c62 100644 --- a/App/merges/android/modules/tabs/templates/wrapper.html +++ b/App/merges/android/modules/tabs/templates/wrapper.html @@ -1,5 +1,6 @@ + @@ -7,6 +8,7 @@ class="button button-clear icon ion-navicon-round" ng-hide="$exposeAside.active"> + \ No newline at end of file diff --git a/App/merges/windows/modules/home/views/home.html b/App/merges/windows/modules/home/views/home.html new file mode 100644 index 00000000..a8a0c327 --- /dev/null +++ b/App/merges/windows/modules/home/views/home.html @@ -0,0 +1,18 @@ + + +
+ + +
+ +
+ Submit +
+
+
\ No newline at end of file diff --git a/App/merges/windows/platform.css b/App/merges/windows/platform.css index 1349cf7d..45d259ed 100644 --- a/App/merges/windows/platform.css +++ b/App/merges/windows/platform.css @@ -36,6 +36,11 @@ ion-header-bar .buttons-right.hidden { transition: all 0.5s; } +ion-header-bar .buttons-right.disabled { + visibility: hidden; + top: 100vh !important; +} + @media only screen and (orientation: landscape) { ion-header-bar .buttons-right { diff --git a/App/merges/windows/platformOverrides.js b/App/merges/windows/platformOverrides.js index 1f52779d..f21fec62 100644 --- a/App/merges/windows/platformOverrides.js +++ b/App/merges/windows/platformOverrides.js @@ -13,7 +13,7 @@ if (window.Windows && Windows.Phone && Windows.Phone.UI.Input.HardwareButtons && var lastScroll = 0; var frame = 0; function checkScroll() { - if (frame === 30) { + if (frame === 20) { frame = 0; var s = document.querySelectorAll('.overflow-scroll'); var sum = 0; @@ -34,6 +34,12 @@ function checkScroll() { }, false); } + if (b[i].querySelectorAll('button').length < 1) { + b[i].classList.add('disabled'); + } else { + b[i].classList.remove('disabled'); + } + if (sum < 15 || b[i].clicked) { b[i].classList.remove('hidden'); } else { diff --git a/App/modules/actions/controllers/actionsController.ts b/App/modules/actions/controllers/actionsController.ts index c57975a2..24b5a907 100644 --- a/App/modules/actions/controllers/actionsController.ts +++ b/App/modules/actions/controllers/actionsController.ts @@ -7,8 +7,7 @@ constructor( private loadingService: Core.ILoadingService - ){ - + ) { this.addTextAsync(); } diff --git a/App/modules/core/services/loadingService.ts b/App/modules/core/services/loadingService.ts index ff712519..01e38e79 100644 --- a/App/modules/core/services/loadingService.ts +++ b/App/modules/core/services/loadingService.ts @@ -5,8 +5,7 @@ constructor( private $ionicLoading: ionic.loading.IonicLoadingService - ){ - } + ){} public show(): void { let options: ionic.loading.IonicLoadingOptions = { diff --git a/App/modules/home/views/home.html b/App/modules/home/views/home.html index 281ff08a..5b0b941c 100644 --- a/App/modules/home/views/home.html +++ b/App/modules/home/views/home.html @@ -1,8 +1,18 @@  -

Parent page

- - Open Scroll page +
+ + +
+
+ Submit +
\ No newline at end of file diff --git a/App/modules/tabs/controllers/navigationController.ts b/App/modules/tabs/controllers/navigationController.ts index da054509..275f6f08 100644 --- a/App/modules/tabs/controllers/navigationController.ts +++ b/App/modules/tabs/controllers/navigationController.ts @@ -7,8 +7,7 @@ module Tabs { private $ionicHistory: ionic.navigation.IonicHistoryService, private $ionicTabsDelegate: ionic.tabs.IonicTabsDelegate, private $ionicPlatform: ionic.platform.IonicPlatformService - ){ - + ){ $ionicPlatform.registerBackButtonAction(e => this.checkBack(e), 100); } @@ -16,9 +15,9 @@ module Tabs { this.$ionicHistory.goBack(); } - public checkBack(e: Event) { + public checkBack(e: Event): void { var page = this.$ionicHistory.currentStateName(); - if (page === Constants.Paths.Todos.Base) { + if (page === Constants.Paths.Home.Base) { let nav: any = navigator; if (nav.app && nav.app.exitApp) { nav.app.exitApp(); @@ -30,16 +29,16 @@ module Tabs { } } - private disableSwipe(e: Event) { + private disableSwipe(e: Event): void { // For example on e.stopPropagation(); } - public onSwipeLeft() { + public onSwipeLeft(): void { this.$ionicTabsDelegate.select(this.$ionicTabsDelegate.selectedIndex() + 1); } - public onSwipeRight() { + public onSwipeRight(): void { let index: number = this.$ionicTabsDelegate.selectedIndex(); if (index > 0) { this.$ionicTabsDelegate.select(this.$ionicTabsDelegate.selectedIndex() - 1); diff --git a/App/scss/helpers/_overrides.scss b/App/scss/helpers/_overrides.scss index ee6c59d7..ea8ae28d 100644 --- a/App/scss/helpers/_overrides.scss +++ b/App/scss/helpers/_overrides.scss @@ -1,5 +1,4 @@ -//////////////////// -// Ionic Overrides +@import "variables"; -$calm: #1AA8D0; +$calm: $Color-Brand-main; $ionicons-font-path: '../fonts/ionic/release/fonts' \ No newline at end of file diff --git a/App/scss/helpers/_variables.scss b/App/scss/helpers/_variables.scss index af2ed251..ad24102e 100644 --- a/App/scss/helpers/_variables.scss +++ b/App/scss/helpers/_variables.scss @@ -1,8 +1,5 @@ -//////////////////// -// Global variables - -// Colors -$Color-Brand-main: #046dfb; +// Colors +$Color-Brand-main: #1AA8D0; $Color-Brand-secondary: #DB8718; $Color-Background-dark: #454545; diff --git a/Visual Studio Template/Visual Studio Template/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_1.zip b/Visual Studio Template/Visual Studio Template/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_2.zip similarity index 82% rename from Visual Studio Template/Visual Studio Template/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_1.zip rename to Visual Studio Template/Visual Studio Template/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_2.zip index 50c73fce..8fe470dc 100644 Binary files a/Visual Studio Template/Visual Studio Template/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_1.zip and b/Visual Studio Template/Visual Studio Template/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_2.zip differ diff --git a/Visual Studio Template/Visual Studio Template/Visual Studio Template.csproj b/Visual Studio Template/Visual Studio Template/Visual Studio Template.csproj index 9886bc4f..86c97544 100644 --- a/Visual Studio Template/Visual Studio Template/Visual Studio Template.csproj +++ b/Visual Studio Template/Visual Studio Template/Visual Studio Template.csproj @@ -44,7 +44,7 @@ - + Always true diff --git a/Visual Studio Template/Visual Studio Template/bin/Debug/MultiplatformCordova_1_0_1.vsix b/Visual Studio Template/Visual Studio Template/bin/Debug/MultiplatformCordova_1_0_2.vsix similarity index 94% rename from Visual Studio Template/Visual Studio Template/bin/Debug/MultiplatformCordova_1_0_1.vsix rename to Visual Studio Template/Visual Studio Template/bin/Debug/MultiplatformCordova_1_0_2.vsix index dd87f39b..16c385b9 100644 Binary files a/Visual Studio Template/Visual Studio Template/bin/Debug/MultiplatformCordova_1_0_1.vsix and b/Visual Studio Template/Visual Studio Template/bin/Debug/MultiplatformCordova_1_0_2.vsix differ diff --git a/Visual Studio Template/Visual Studio Template/bin/Debug/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_1.zip b/Visual Studio Template/Visual Studio Template/bin/Debug/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_2.zip similarity index 82% rename from Visual Studio Template/Visual Studio Template/bin/Debug/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_1.zip rename to Visual Studio Template/Visual Studio Template/bin/Debug/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_2.zip index 50c73fce..8fe470dc 100644 Binary files a/Visual Studio Template/Visual Studio Template/bin/Debug/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_1.zip and b/Visual Studio Template/Visual Studio Template/bin/Debug/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_2.zip differ diff --git a/Visual Studio Template/Visual Studio Template/bin/Debug/extension.vsixmanifest b/Visual Studio Template/Visual Studio Template/bin/Debug/extension.vsixmanifest index 1b7affe8..ee75fc86 100644 --- a/Visual Studio Template/Visual Studio Template/bin/Debug/extension.vsixmanifest +++ b/Visual Studio Template/Visual Studio Template/bin/Debug/extension.vsixmanifest @@ -1,6 +1,6 @@ - + Cordova Multiplatform Template HTML5 Apps for [Windows, IOS, Android] with Apache Cordova more info -> http://cordova-multiplatform-template.js.org http://cordova-multiplatform-template.js.org/ diff --git a/Visual Studio Template/Visual Studio Template/obj/Debug/Visual Studio Template.csproj.FileListAbsolute.txt b/Visual Studio Template/Visual Studio Template/obj/Debug/Visual Studio Template.csproj.FileListAbsolute.txt index e7aba370..ab531e97 100644 --- a/Visual Studio Template/Visual Studio Template/obj/Debug/Visual Studio Template.csproj.FileListAbsolute.txt +++ b/Visual Studio Template/Visual Studio Template/obj/Debug/Visual Studio Template.csproj.FileListAbsolute.txt @@ -17,4 +17,4 @@ C:\Projects\Quique\CordovaMultipltform\Visual Studio Template\Visual Studio Temp C:\Projects\Quique\CordovaMultipltform\Visual Studio Template\Visual Studio Template\obj\Debug\Visual Studio Template.pdb C:\Projects\Quique\CordovaMultipltform\Visual Studio Template\Visual Studio Template\obj\Debug\extension.vsixmanifest C:\Projects\Quique\CordovaMultipltform\Visual Studio Template\Visual Studio Template\bin\Debug\ProjectTemplates\Apache Cordova Apps\Cordova-12_9_2015-18_38_6.zip -C:\Datos\Github\Cordova-Multiplatform-Template\Visual Studio Template\Visual Studio Template\bin\Debug\ProjectTemplates\Apache Cordova Apps\MultiplatformCordova_1_0_1.zip +C:\Datos\Github\Cordova-Multiplatform-Template\Visual Studio Template\Visual Studio Template\bin\Debug\ProjectTemplates\Apache Cordova Apps\MultiplatformCordova_1_0_2.zip diff --git a/Visual Studio Template/Visual Studio Template/obj/Debug/Visual Studio Template.csproj.VsixDeployedFileListAbsolute.txt b/Visual Studio Template/Visual Studio Template/obj/Debug/Visual Studio Template.csproj.VsixDeployedFileListAbsolute.txt index 5532abb9..1eb154de 100644 --- a/Visual Studio Template/Visual Studio Template/obj/Debug/Visual Studio Template.csproj.VsixDeployedFileListAbsolute.txt +++ b/Visual Studio Template/Visual Studio Template/obj/Debug/Visual Studio Template.csproj.VsixDeployedFileListAbsolute.txt @@ -83,3 +83,8 @@ C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.1\\license.txt C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.1\\thumbnail.PNG C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.1\\__TemplateIcon.ico +C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.2\\extension.vsixmanifest +C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.2\ProjectTemplates\Apache Cordova Apps\\MultiplatformCordova_1_0_2.zip +C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.2\\license.txt +C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.2\\thumbnail.PNG +C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.2\\__TemplateIcon.ico diff --git a/Visual Studio Template/Visual Studio Template/obj/Debug/extension.vsixmanifest b/Visual Studio Template/Visual Studio Template/obj/Debug/extension.vsixmanifest index 1b7affe8..ee75fc86 100644 --- a/Visual Studio Template/Visual Studio Template/obj/Debug/extension.vsixmanifest +++ b/Visual Studio Template/Visual Studio Template/obj/Debug/extension.vsixmanifest @@ -1,6 +1,6 @@ - + Cordova Multiplatform Template HTML5 Apps for [Windows, IOS, Android] with Apache Cordova more info -> http://cordova-multiplatform-template.js.org http://cordova-multiplatform-template.js.org/ diff --git a/Visual Studio Template/Visual Studio Template/source.extension.vsixmanifest b/Visual Studio Template/Visual Studio Template/source.extension.vsixmanifest index 4cf0bba4..44cefe6a 100644 --- a/Visual Studio Template/Visual Studio Template/source.extension.vsixmanifest +++ b/Visual Studio Template/Visual Studio Template/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + Cordova Multiplatform Template HTML5 Apps for [Windows, IOS, Android] with Apache Cordova more info -> http://cordova-multiplatform-template.js.org http://cordova-multiplatform-template.js.org/ @@ -18,6 +18,6 @@ - +