Merge branch 'master' of git.osdn.net:/gitroot/eos/zephyr

[eos/zephyr.git] / front-end / app / scripts / App.ts

diff --git a/front-end/app/scripts/App.ts b/front-end/app/scripts/App.ts
old mode 100644 (file)
new mode 100755 (executable)
index 6c9d5ce..44defb1
--- a/front-end/app/scripts/App.ts
+++ b/front-end/app/scripts/App.ts
@@ -4,7 +4,10 @@ namespace app {
     var appName = 'zephyr';
     export var zephyr = angular.module(appName, ['ui.router', 'ngResource', 'ui.bootstrap']);
 
+<<<<<<< HEAD
+=======
 
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
     zephyr.config(($stateProvider, $urlRouterProvider, $locationProvider) => {
 
         $urlRouterProvider.otherwise('/execution');
@@ -35,16 +38,36 @@ namespace app {
         })
     });
 
+<<<<<<< HEAD
+// services
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
     zephyr.service('APIEndPoint', services.APIEndPoint);
     zephyr.service('MyModal', services.MyModal);
     zephyr.service('WebSocket', services.WebSocket);
     zephyr.service('Console', services.Console);
 
+<<<<<<< HEAD
+// filters
+    zephyr.filter('Tag', filters.Tag);
+
+// controllers
+/// SelectCommand
+    zephyr.controller('selectCommandController', controllers.SelectCommand);
+
+/// Preview
+    zephyr.controller('previewController', controllers.Preview);
+
+/// Upload
+    zephyr.controller('uploadController', controllers.Upload);
+
+=======
 
     zephyr.filter('Tag', filters.Tag);
     zephyr.controller('selectCommandController', controllers.SelectCommand);
     zephyr.controller('previewController', controllers.Preview);
 
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 
     zephyr.controller('executionController', controllers.Execution);
     zephyr.controller('workspaceController', controllers.Workspace);
@@ -54,6 +77,10 @@ namespace app {
     zephyr.controller('optionController', directives.OptionController);
     zephyr.controller('directoryController', directives.DirectoryController);
     zephyr.controller('HeaderMenuController', directives.HeaderMenuController);
+<<<<<<< HEAD
+    zephyr.controller('uploadController', directives.UploadController);
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 
     zephyr.directive('headerMenu', directives.HeaderMenu.Factory());
     zephyr.directive('command', directives.Command.Factory());