Merge branch 'development'

# Conflicts: # Visual Studio Template/Visual Studio Template/Visual Studio Template.csproj # Visual Studio Template/Visual Studio Template/bin/Debug/MultiplatformCordova_1_0_1.vsix # 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 3, 2015 · 32a033b · 32a033b
2 parents e1cf747 + 1876b55
commit 32a033b
Show file tree

Hide file tree

Showing 21 changed files with 114 additions and 154 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 App/bld/
 App/bin/
 App/platforms/
+App/plugins/
 App/node_modules/
 App/bower_components/
 App/typings/

diff --git a/App/app.ts b/App/app.ts
@@ -8,10 +8,10 @@ module App {
             'ionic',
             Constants.Paths.Core,
             Constants.Paths.Tabs,
-            Constants.Paths.Side.Module,
-            Constants.Paths.Home.Module,
-            Constants.Paths.Actions.Module,
-            Constants.Paths.Buttons.Module
+            Constants.Paths.Side.Base,
+            Constants.Paths.Home.Base,
+            Constants.Paths.Actions.Base,
+            Constants.Paths.Buttons.Base
         ])
         .config(statesConfiguration);
 

diff --git a/App/constants/interfaces/IPaths.ts b/App/constants/interfaces/IPaths.ts
@@ -1,27 +1,24 @@
 module Constants {
     'use strict';
 
-    interface ISubPage {
-        Path: string,
-        Uri: string
-    };
-
-    interface IPage {
-        Module: string,
-        Main: ISubPage,
-    };
-
-    interface IHomePage extends IPage {
-        Scroll: ISubPage
-    }
-
     export interface IPaths {
         Core: string,
         Modules: string,
         Tabs: string,
-        Side: IPage,
-        Home: IHomePage,
-        Actions: IPage,
-        Buttons: IPage
+        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
@@ -1,43 +1,23 @@
 module Constants {
     'use strict';
 
-    let base = 'tabs';
-
     export let Paths: IPaths = {
         Core: 'core',
         Modules: 'modules/',
-        Tabs: base,
+        Tabs: 'tabs',
         Side: {
-            Module: 'side',
-            Main: {
-                Path: base + '.left',
-                Uri: 'left'
-            }
+            Base: 'side',
+            Left: 'left'
         },
         Home: {
-            Module: 'home',
-            Main: {
-                Path: base + '.home',
-                Uri: 'home'
-            },
-            Scroll: {
-                Path: base + '.scroll',
-                Uri: 'scroll'
-            }
+            Base: 'home',
+            Scroll: 'scroll'
         },
         Actions: {
-            Module: 'actions',
-            Main: {
-                Path: base + '.actions',
-                Uri: 'actions'
-            },
+            Base: 'actions'
         },
         Buttons: {
-            Module: 'buttons',
-            Main: {
-                Path: base + '.buttons',
-                Uri: 'buttons'
-            }
+            Base: 'buttons'
         }
     };
-}
+};
diff --git a/App/merges/android/modules/tabs/templates/wrapper.html b/App/merges/android/modules/tabs/templates/wrapper.html
@@ -1,6 +1,5 @@
 <ion-nav-bar class="bar-calm" 
-             align-title="left" 
-             ng-controller="navigationController as nav">
+             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">

diff --git a/App/modules/actions/actions-module.ts b/App/modules/actions/actions-module.ts
@@ -1,22 +1,26 @@
 module Actions {
     'use strict';
 
-    angular.module(Constants.Paths.Actions.Module, [])
+    import Paths = Constants.Paths;
+    let Page = Paths.Actions;
+
+    angular.module(Page.Base, [])
         .config(statesConfiguration);
 
     function statesConfiguration(
         $stateProvider: ng.ui.IStateProvider
     ): void {
 
         $stateProvider
-            .state(Constants.Paths.Actions.Main.Path, {
-                url: '/' + Constants.Paths.Actions.Main.Uri,
+            .state(Paths.Tabs + '.' + Page.Base, {
+                url: '/' + Page.Base,
                 views: {
                     'actions-tab': {
                         controller: 'actionsController as vm',
-                        templateUrl: Constants.Paths.Modules + 'actions/views/' + Constants.Paths.Actions.Main.Uri + '.html'
+                        templateUrl: Paths.Modules + 'actions/views/actions.html'
                     }
                 }
-            });
+            }
+        );
     }
 }
diff --git a/App/modules/actions/controllers/actionsController.ts b/App/modules/actions/controllers/actionsController.ts
@@ -21,7 +21,7 @@
         }
     }
 
-    angular.module(Constants.Paths.Actions.Main.Uri)
+    angular.module(Constants.Paths.Actions.Base)
         .controller('actionsController', ActionsController);
 } 
 
diff --git a/App/modules/buttons/buttons-module.ts b/App/modules/buttons/buttons-module.ts
@@ -1,20 +1,25 @@
 module Buttons {
     'use strict';
 
-    angular.module(Constants.Paths.Buttons.Module, [])
+    import Paths = Constants.Paths;
+    let Page = Paths.Buttons;
+
+    angular.module(Page.Base, [])
         .config(statesConfiguration);
 
     function statesConfiguration(
         $stateProvider: ng.ui.IStateProvider
     ): void {
+
         $stateProvider
-            .state(Constants.Paths.Buttons.Main.Path, {
-                url: '/' + Constants.Paths.Buttons.Main.Uri,
+            .state(Paths.Tabs + '.' + Page.Base, {
+                url: '/' + Page.Base,
                 views: {
                     'buttons-tab': {
-                        templateUrl: Constants.Paths.Modules + 'buttons/views/' + Constants.Paths.Buttons.Main.Uri + '.html'
+                        templateUrl: Paths.Modules + 'buttons/views/buttons.html'
                     }
                 }
-            });
+            }
+        );
     }
 }
diff --git a/App/modules/core/core-module.ts b/App/modules/core/core-module.ts
@@ -1,5 +1,5 @@
 module Core {
     'use strict';
 
-    angular.module('core', []);
+    angular.module(Constants.Paths.Core, []);
 }
diff --git a/App/modules/core/services/loadingService.ts b/App/modules/core/services/loadingService.ts
@@ -20,6 +20,6 @@
         }
     }
 
-    angular.module('core')
+    angular.module(Constants.Paths.Core)
         .service('loadingService', LoadingService);
 }
diff --git a/App/modules/home/home-module.ts b/App/modules/home/home-module.ts
@@ -1,29 +1,34 @@
 module Home {
     'use strict';
 
-    angular.module(Constants.Paths.Home.Module, [])
+    import Paths = Constants.Paths;
+    let Page = Paths.Home; 
+
+    angular.module(Page.Base, [])
         .config(statesConfiguration);
 
     function statesConfiguration(
         $stateProvider: ng.ui.IStateProvider
     ): void {
+
         $stateProvider
-            .state(Constants.Paths.Home.Main.Path, {
-                url: '/' + Constants.Paths.Home.Main.Uri,
+            .state(Paths.Tabs + '.' + Page.Base, {
+                url: '/' + Page.Base,
                 views: {
                     'home-tab': {
-                        templateUrl: Constants.Paths.Modules + 'home/views/' + Constants.Paths.Home.Main.Uri + '.html'
+                        templateUrl: Paths.Modules + 'home/views/home.html'
                     }
                 }
             })
 
-            .state(Constants.Paths.Home.Scroll.Path, {
-                url: '/' + Constants.Paths.Home.Scroll.Uri,
+            .state(Paths.Tabs + '.' + Page.Scroll, {
+                url: '/' + Page.Scroll,
                 views: {
                     'home-tab': {
-                        templateUrl: Constants.Paths.Modules + 'home/views/' + Constants.Paths.Home.Scroll.Uri + '.html'
+                        templateUrl: Paths.Modules + 'home/views/scroll.html'
                     }
                 }
-            });
+            }
+        );
     }
 }
diff --git a/App/modules/side/side-module.ts b/App/modules/side/side-module.ts
@@ -1,20 +1,25 @@
 module Side {
     'use strict';
 
-    angular.module(Constants.Paths.Side.Module, [])
+    import Paths = Constants.Paths;
+    let Page = Paths.Side;
+
+    angular.module(Page.Base, [])
         .config(statesConfiguration);
 
     function statesConfiguration(
         $stateProvider: ng.ui.IStateProvider
     ): void {
+
         $stateProvider
-            .state(Constants.Paths.Side.Main.Path, {
-                url: '/' + Constants.Paths.Side.Main.Uri,
+            .state(Paths.Tabs + '.' + Page.Left, {
+                url: '/' + Page.Left,
                 views: {
                     'left-tab': {
-                        templateUrl: Constants.Paths.Modules + 'side/views/' + Constants.Paths.Side.Main.Uri + '.html'
+                        templateUrl: Paths.Modules + 'side/views/left.html'
                     }
                 }
-            });
+            }
+        );
     }
 }
diff --git a/App/modules/tabs/controllers/navigationController.ts b/App/modules/tabs/controllers/navigationController.ts
@@ -18,7 +18,7 @@
 
         public checkBack(e: Event) {
             var page = this.$ionicHistory.currentStateName();
-            if (page === Constants.Paths.Home.Main.Path) {
+            if (page === Constants.Paths.Home.Base) {
                 var nav: any = navigator;
                 if (nav.app && nav.app.exitApp) {
                     nav.app.exitApp();

diff --git a/App/modules/tabs/tabs-module.ts b/App/modules/tabs/tabs-module.ts
@@ -1,17 +1,19 @@
 module Tabs {
     'use strict';
 
-    angular.module(Constants.Paths.Tabs, [])
+    import Paths = Constants.Paths;
+
+    angular.module(Paths.Tabs, [])
         .config(statesConfiguration);
 
     function statesConfiguration(
         $stateProvider: ng.ui.IStateProvider
     ): void {
         $stateProvider
-            .state(Constants.Paths.Tabs, {
-                url: '/' + Constants.Paths.Tabs,
+            .state(Paths.Tabs, {
+                url: '/' + Paths.Tabs,
                 abstract: true,
-                templateUrl: Constants.Paths.Modules + 'tabs/templates/' + Constants.Paths.Tabs + '.html'
+                templateUrl: Paths.Modules + 'tabs/templates/tabs.html'
             });
     }
 }
diff --git a/App/modules/tabs/templates/wrapper.html b/App/modules/tabs/templates/wrapper.html
@@ -1,6 +1,5 @@
 <!-- iOS partials for default, check /merges/ for android and windows -->
-<ion-nav-bar class="bar-stable" 
-             ng-controller="navigationController as nav">
+<ion-nav-bar class="bar-stable">
     <ion-nav-back-button class="button-icon icon ion-ios-arrow-left text-left">
         Back
     </ion-nav-back-button>

diff --git a/App/plugins/android.json b/App/plugins/android.json
diff --git a/App/plugins/fetch.json b/App/plugins/fetch.json
diff --git a/App/plugins/ios.json b/App/plugins/ios.json
diff --git a/App/plugins/windows.json b/App/plugins/windows.json