OSDN Git Service

Merge branch 'master' of git.osdn.net:/gitroot/eos/zephyr
[eos/zephyr.git] / front-end / app / scripts / controllers / Preview.ts
1 namespace app.controllers {
2 <<<<<<< HEAD
3     export class Preview { 
4 =======
5     export class Preview{ 
6 >>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
7
8         public static $inject = ['$scope', 'APIEndPoint','$uibModalInstance'];
9         private tags: string[];
10         private commands: string[];
11         private searchText: string;
12         private currentTag: string;
13
14         constructor($scope: ng.IScope, private APIEndPoint: services.APIEndPoint, private $modalInstance: ng.ui.bootstrap.IModalServiceInstance) {
15             var controller = this;
16             console.log('preview');
17             /*
18             this.APIEndPoint
19                 .getCommands()
20                 .$promise.then((result) => {
21 <<<<<<< HEAD
22                    controller.commands = result.info;
23 =======
24                    controller.commands = result.info; 
25 >>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
26                 });
27             this.currentTag = 'all';
28             */
29
30 <<<<<<< HEAD
31         }
32 =======
33         } 
34 >>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
35
36     }
37 }