Merge branch 'development'

# Conflicts: # App/Cordova_App.vstemplate # Visual Studio Template/Visual Studio Template/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_2.zip # Visual Studio Template/Visual Studio Template/Visual Studio Template.csproj # Visual Studio Template/Visual Studio Template/bin/Debug/MultiplatformCordova_1_0_2.vsix # Visual Studio Template/Visual Studio Template/bin/Debug/ProjectTemplates/Apache Cordova Apps/MultiplatformCordova_1_0_2.zip # Visual Studio Template/Visual Studio Template/bin/Debug/extension.vsixmanifest # Visual Studio Template/Visual Studio Template/obj/Debug/Visual Studio Template.csproj.FileListAbsolute.txt # Visual Studio Template/Visual Studio Template/obj/Debug/Visual Studio Template.csproj.VsixDeployedFileListAbsolute.txt # Visual Studio Template/Visual Studio Template/obj/Debug/extension.vsixmanifest # Visual Studio Template/Visual Studio Template/source.extension.vsixmanifest
CKGrafico · Nov 4, 2015 · 29aad90 · 29aad90
2 parents 32a033b + f8315ac
commit 29aad90
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 55 deletions.
diff --git a/App/constants/interfaces/IPaths.ts b/App/constants/interfaces/IPaths.ts
diff --git 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/gulpfile.js b/App/gulpfile.js
@@ -15,7 +15,7 @@ var runSequence = require('run-sequence');
 
 gulp.task('default', function () {
     // Compile Sass, TypeScript and inject files into index.html
-    runSequence('default:clean', 'default:scss', 'default:ts', 'default:html', 'default:inject');
+    runSequence('default:clean', 'default:html', 'default:scss', 'default:ts', 'default:inject');
 });
 
 gulp.task('initialize', function () {
@@ -25,5 +25,5 @@ gulp.task('initialize', function () {
 
 gulp.task('build', function () {
     // Build project
-    runSequence('build:files', 'build:html', 'build:clean');
-});
+    runSequence('build:clean', 'build:html', 'build:files');
+});
diff --git a/App/merges/android/modules/home/views/home.html b/App/merges/android/modules/home/views/home.html
@@ -0,0 +1,20 @@
+<ion-view view-title="Home">
+    <ion-content>
+        <div class="list">
+            <label class="item item-input item-floating-label">
+                <span class="input-label">First Name</span>
+                <input type="text" 
+                       placeholder="First Name">
+            </label>
+            <label class="item item-input item-floating-label">
+                <span class="input-label">Last Name</span>
+                <input type="text" 
+                       placeholder="Last Name">
+            </label>
+        </div>
+
+        <div class="padding">
+            <a class="button button-block button-positive icon icon-right ion-chevron-right" ui-sref="tabs.scroll">Submit</a>
+        </div>
+    </ion-content>
+</ion-view>
diff --git a/App/merges/android/modules/tabs/templates/wrapper.html b/App/merges/android/modules/tabs/templates/wrapper.html
@@ -1,12 +1,14 @@
 <ion-nav-bar class="bar-calm" 
              align-title="left">
+
     <ion-nav-back-button class="button-icon icon icon-only ion-arrow-left-c"></ion-nav-back-button>
 
     <ion-nav-buttons side="left">
         <button menu-toggle="left" 
                 class="button button-clear icon ion-navicon-round" 
                 ng-hide="$exposeAside.active"></button>
     </ion-nav-buttons>
+
 </ion-nav-bar>
 
 <ion-nav-view></ion-nav-view>
diff --git a/App/merges/windows/modules/home/views/home.html b/App/merges/windows/modules/home/views/home.html
@@ -0,0 +1,18 @@
+<ion-view view-title="Home">
+    <ion-content>
+        <div class="list">
+            <label class="item item-input">
+                <span class="input-label">First Name</span>
+                <input type="text">
+            </label>
+            <label class="item item-input">
+                <span class="input-label">Last Name</span>
+                <input type="text">
+            </label>
+        </div>
+
+        <div class="padding">
+            <a class="button button-block button-positive icon icon-right ion-chevron-right" ui-sref="tabs.scroll">Submit</a>
+        </div>
+    </ion-content>
+</ion-view>
diff --git a/App/merges/windows/platform.css b/App/merges/windows/platform.css
diff --git 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
@@ -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
@@ -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
@@ -1,8 +1,18 @@
 <ion-view view-title="Home">
     <ion-content class="padding">
-        <h1>Parent page</h1>
-
-        <a class="button icon icon-right ion-chevron-right" href="#/tabs/scroll">Open Scroll page</a>
+        <div class="list">
+            <label class="item item-input">
+                <input type="text" 
+                       placeholder="First Name">
+            </label>
+            <label class="item item-input">
+                <input type="text" 
+                       placeholder="Last Name">
+            </label>
+        </div>
 
+        <div class="padding">
+            <a class="button button-block button-positive icon icon-right ion-chevron-right" ui-sref="tabs.scroll">Submit</a>
+        </div>
     </ion-content>
 </ion-view>
diff --git a/App/modules/tabs/controllers/navigationController.ts b/App/modules/tabs/controllers/navigationController.ts
@@ -1,4 +1,4 @@
-module Tabs {
+module Tabs {
     'use strict';
 
     export class NavigationController {
@@ -7,19 +7,18 @@
             private $ionicHistory: ionic.navigation.IonicHistoryService,
             private $ionicTabsDelegate: ionic.tabs.IonicTabsDelegate,
             private $ionicPlatform: ionic.platform.IonicPlatformService
-            ){
-
+        ){
             $ionicPlatform.registerBackButtonAction(e => this.checkBack(e), 100);
         }
 
         public goBack(): void {
             this.$ionicHistory.goBack();
         }
 
-        public checkBack(e: Event) {
+        public checkBack(e: Event): void {
             var page = this.$ionicHistory.currentStateName();
             if (page === Constants.Paths.Home.Base) {
-                var nav: any = navigator;
+                let nav: any = navigator;
                 if (nav.app && nav.app.exitApp) {
                     nav.app.exitApp();
                 } else {
@@ -30,18 +29,24 @@
             }
         }
 
-        // On Windows phone
-        public onSwipeLeft() {
+        private disableSwipe(e: Event): void {
+            // For example on <ion-list>
+            e.stopPropagation();
+        }
+
+        public onSwipeLeft(): void {
             this.$ionicTabsDelegate.select(this.$ionicTabsDelegate.selectedIndex() + 1);
         }
 
-        public onSwipeRight() {
-            this.$ionicTabsDelegate.select(this.$ionicTabsDelegate.selectedIndex() - 1);
+        public onSwipeRight(): void {
+            let index: number = this.$ionicTabsDelegate.selectedIndex();
+            if (index > 0) {
+                this.$ionicTabsDelegate.select(this.$ionicTabsDelegate.selectedIndex() - 1);
+            }
         }
     }
 
     angular.module(Constants.Paths.Tabs)
         .controller('navigationController', NavigationController);
 
 } 
-
diff --git 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'