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

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

diff --git a/front-end/app/scripts/directives/Option.ts b/front-end/app/scripts/directives/Option.ts
index 61d7722..f81c6f3 100755 (executable)
--- a/front-end/app/scripts/directives/Option.ts
+++ b/front-end/app/scripts/directives/Option.ts
@@ -1,4 +1,5 @@
 namespace app.directives {
+<<<<<<< HEAD
   export class Option implements ng.IDirective {
 
     public restrict: string;
@@ -63,4 +64,70 @@ namespace app.directives {
       });
     }
   }
+=======
+    export class Option implements ng.IDirective {
+
+        public restrict: string;
+        public replace: boolean;
+        public templateUrl: string;
+        public bindToController: Object;
+        public controller: string;
+        public controllerAs: string;
+        public scope: boolean;
+
+        /** 
+         * constructor
+         *
+         * @param
+         */
+        constructor() {
+            this.restrict = 'E';
+            this.replace = true;
+            this.controller = 'optionController';
+            this.bindToController = {
+                info: '=',
+                files: '='
+            };
+            this.scope = true;
+            this.templateUrl = 'templates/option.html';
+            this.controllerAs = 'ctrl';
+        }
+
+        /**
+         * instance生成
+         * @returns {function(): HeaderMenu}
+         * @constructor
+         */
+        public static Factory(): ng.IDirectiveFactory {
+            var directive = () => {
+            return new Option();
+            };
+            directive.$inject = [];
+            return directive;
+        }
+    }
+
+    export class OptionController {
+
+        public static $inject = [];
+
+        private info: declares.IOption;
+
+        constructor() {
+            var controller = this;
+
+            // データバインディングしているarg.inputに
+            // OptionControlFileに記された初期値(arg.initialValue)を代入
+            angular.forEach(controller.info.arg, (arg) => {
+                if(arg.initialValue) {
+                    if(arg.formType === 'number') {
+                        arg.input = parseInt(arg.initialValue);
+                    } else {
+                        arg.input = arg.initialValue;
+                    }
+                }
+            });
+        }
+    } 
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 }