new

vickykatoch · Dec 14, 2015 · 30fffb4 · 30fffb4
1 parent d0e683e
commit 30fffb4
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 11 deletions.
diff --git a/app/app.module.js b/app/app.module.js
@@ -1,5 +1,6 @@
+/// <reference path="../typings/angularjs/angular.d.ts" />
 var avam;
 (function (avam) {
     'use strict';
-    angular.module("avam", ["avamUI"]);
+    angular.module("avam", ["avamUI", 'ui.router']);
 })(avam || (avam = {}));
diff --git a/app/app.module.ts b/app/app.module.ts
@@ -1,4 +1,5 @@
+/// <reference path="../typings/angularjs/angular.d.ts" />
 module avam{
 	'use strict';
-	angular.module("avam", ["avamUI"]);
+	angular.module("avam", ["avamUI",'ui.router']);
 }
diff --git a/dist/avamUI.controller.js b/dist/avamUI.controller.js
@@ -5,12 +5,13 @@ var avam;
     var ui;
     (function (ui) {
         var AvamUIModelController = (function () {
-            function AvamUIModelController(scope, rootScope, ngWin, ngTimeout) {
+            function AvamUIModelController(scope, rootScope, ngWin, ngTimeout, stateService) {
                 var _this = this;
                 this.scope = scope;
                 this.rootScope = rootScope;
                 this.ngWin = ngWin;
                 this.ngTimeout = ngTimeout;
+                this.stateService = stateService;
                 this.isMenuVisible = true;
                 this.isMenuButtonVisible = false;
                 this.route = "";
@@ -27,6 +28,7 @@ var avam;
                     _this.checkWidth();
                     _this.broadcastMenuState();
                 }, 0);
+                this.onRouteChanged();
             }
             AvamUIModelController.prototype.checkWidth = function () {
                 var width = Math.max($(this.ngWin).width(), this.ngWin.innerWidth);
@@ -44,6 +46,7 @@ var avam;
                 var _this = this;
                 this.scope.$on('AVAM-MENU-ITEM-CHANGED', function (evt, data) {
                     _this.route = data.route;
+                    _this.stateService.state(_this.route);
                 });
             };
             AvamUIModelController.prototype.onOrientationChange = function () {
@@ -55,7 +58,7 @@ var avam;
                 this.isMenuVisible = !this.isMenuVisible;
                 this.broadcastMenuState();
             };
-            AvamUIModelController.$inject = ['$scope', '$rootScope', '$window', '$timeout'];
+            AvamUIModelController.$inject = ['$scope', '$rootScope', '$window', '$timeout', ' $state'];
             return AvamUIModelController;
         })();
         ui.AvamUIModelController = AvamUIModelController;

diff --git a/dist/avamUI.module.js b/dist/avamUI.module.js
@@ -4,6 +4,6 @@ var avam;
     var ui;
     (function (ui) {
         'use strict';
-        angular.module("avamUI", ["avam-menu"]);
+        angular.module("avamUI", ["avam-menu", "ui.router"]);
     })(ui = avam.ui || (avam.ui = {}));
 })(avam || (avam = {}));
diff --git a/gulpfile.config.js b/gulpfile.config.js
@@ -8,6 +8,8 @@ var GulpConfig = (function () {
         this.templatePath = "./src/*.html";
         this.jsFilePath = "./dist/*.js";
         this.moduleName = 'avamUI';
+        this.appFiles = './app/*.ts';
+        this.appPath = './app/';
     }
     return gulpConfig;
 })();

diff --git a/gulpfile.js b/gulpfile.js
@@ -27,4 +27,12 @@ gulp.task('compile:ts', function(){
 
 gulp.task('watch', function(){
     gulp.watch(gulpConfig.typeScriptSourceFiles, ['clean','compile:ts']);
+});
+
+gulp.task('app', function(){
+    return gulp.src(gulpConfig.appFiles)
+                .pipe(ts({
+                        noImplicitAny: true
+                       }))
+        .pipe(gulp.dest(gulpConfig.appPath));
 });
diff --git a/index.html b/index.html
@@ -15,8 +15,8 @@
 	<avam-ui title="AVAM" sub-title="A Framework Framework" 
 			icon-file="app/assets/images/logo.jpg">
 		<avam-menu allow-toggle="true" orientation="horizontal">
-			<avam-menu-item label="Dashboard" icon="glyphicon-dashboard" route="Dashboard"></avam-menu-item>
-			<avam-menu-item label="Income Statement" icon="glyphicon-phone" route="Income Statement"></avam-menu-item>
+			<avam-menu-item label="Dashboard" icon="glyphicon-dashboard" route="home"></avam-menu-item>
+			<avam-menu-item label="Income Statement" icon="glyphicon-phone" route="incomestatement"></avam-menu-item>
 			<avam-menu-item label="Help" icon="glyphicon-phone-alt" route="Help"></avam-menu-item>
 			<avam-menu-group label="Sub Menu" icon="glyphicon-cd">
 
@@ -31,6 +31,7 @@
 	<script src="lib/jquery/dist/jquery.js"></script>
 	<script src="lib/angular/angular.js"></script>
 	<script src="lib/angular-animate/angular-animate.js"></script>
+	<script src="lib/angular-ui-router/release/angular-ui-router.js"></script>
 
 	<script src="lib/avam-menu/dist/avam-menu.js"></script>
 
@@ -39,6 +40,7 @@
 	<script src="dist/avamUI.controller.js"></script>
 
 	<script src="app/app.module.js"></script>
+	<script src="app/app.route.js"></script>
 
 </body>
 

diff --git a/src/avamUI.controller.ts b/src/avamUI.controller.ts
@@ -23,9 +23,10 @@ module avam.ui{
 		isMenuButtonVisible:boolean=false;
 		route:string="";
 
-		static $inject =['$scope', '$rootScope', '$window','$timeout'];
+		static $inject =['$scope', '$rootScope', '$window','$timeout',' $state'];
 		constructor(private scope : IIAvamUIScope, private rootScope: ng.IRootScopeService, 
-					private ngWin : ng.IWindowService, private ngTimeout : ng.ITimeoutService){
+					private ngWin : ng.IWindowService, private ngTimeout : ng.ITimeoutService,
+					private stateService: ng.ui.IStateService){
 			$(window).on('resize.avam',(evt: JQueryEventObject, args:any[]):any=>
 			{
 				this.scope.$apply(()=>{
@@ -43,6 +44,7 @@ module avam.ui{
 				this.checkWidth();
 				this.broadcastMenuState();
 			},0);
+			this.onRouteChanged();
 		}
 		checkWidth():void{
 			var width = Math.max($(this.ngWin).width(), this.ngWin.innerWidth);
@@ -61,6 +63,7 @@ module avam.ui{
 		onRouteChanged():void{
 			this.scope.$on('AVAM-MENU-ITEM-CHANGED',  (evt: ng.IAngularEvent,  data:any):void=>{
 				this.route=data.route;
+			    this.stateService.state(this.route);
 			});
 		}
 		onOrientationChange(): void{

diff --git a/src/avamUI.module.ts b/src/avamUI.module.ts
@@ -2,5 +2,5 @@
 
 module avam.ui{
 	'use strict';
-	angular.module("avamUI", ["avam-menu"]);
+	angular.module("avamUI", ["avam-menu", "ui.router"]);
 }
diff --git a/src/avamUI.template.html b/src/avamUI.template.html
@@ -21,4 +21,5 @@
 		</div>
 	</div>
 </div>
-<div ng-transclude ng-show="vm.isMenuVisible"></div>
+<div ng-transclude ng-show="vm.isMenuVisible"></div>
+<div ui-view>View</div>