Merge remote-tracking branch 'upstream/master'

Author: hecforga

app/assets/internal_lib/angular-ui-tree/angular-ui-tree.js

@@ -192,12 +192,10 @@
         };
 
         $scope.deselect = function(){
-          if($scope.selected){
+          if($scope.selected && $scope.$treeScope.$callbacks.deselect($scope)){
             $scope.selected = false;
 
             $scope.$treeScope.selecteds.splice($scope.$treeScope.selecteds.indexOf($scope.$element), 1);
-
-            $scope.$treeScope.$callbacks.deselect($scope);
           }
         };
 
@@ -208,12 +206,10 @@
         };
 
         $scope.select = function(){
-          if(!$scope.selected){
+          if(!$scope.selected && $scope.$treeScope.$callbacks.select($scope)){
             $scope.selected = true;
 
             $scope.$treeScope.selecteds.push($scope.$element);
-
-            $scope.$treeScope.$callbacks.select($scope);
           }
         };
       }
@@ -540,12 +536,17 @@
 
             };
 
+            /**
+             * Callback checks if the node can be selected
+             * @param node
+             * @returns {boolean}
+             */
             callbacks.select = function(node){
-
+              return true;
             };
 
             callbacks.deselect = function(node){
-
+              return true;
             };
 
             callbacks.endSelect = function(){

app/assets/internal_lib/angular-ui-tree/angular-ui-tree.min.js

@@ -139,6 +139,10 @@ module app.core.dataschema {
                 this.addPropertyToRequired(label, parent);
             }
 
+            if (config['format']){
+                property['format'] = config['format'];
+            }
+
             if (config['allowsEnum'] && config['enum'].length > 0) {
                 property['enum'] = config['enum'];
             }

app/src/components/core/dataschema/dataschema.service.ts

@@ -21,6 +21,12 @@ module app.toolbox {
                 accept: () => {
                     return false;
                 },
+                select: (node) => {
+                    if(node.$modelValue.datatype === "object"){
+                        return false;
+                    }
+                    return true;
+                },
                 beforeDrag: (sourceNodeScope) => {
                     var dragElement:ControlToolboxElement = sourceNodeScope.$modelValue;
                     return !dragElement.isObject();

app/src/components/toolbox/toolbox.controller.ts

@@ -67,6 +67,16 @@
         <script type="text/ng-template" id="advanced.html">
             <md-checkbox toolbox-focus-input="toolbox-bottom-input" ng-model="$parent.toolboxBottom.newElementConfig.required">Required</md-checkbox>
             <md-checkbox toolbox-focus-input="toolbox-bottom-input" ng-show="$parent.toolboxBottom.newElementConfig.allowsEnum" ng-model="$parent.toolboxBottom.showEnum">Enum</md-checkbox>
+
+            <md-input-container ng-if="$parent.toolboxBottom.newElementConfig.formats" class="md-block">
+                <label for="toolbox-bottom-advanced-format">Format</label>
+                <md-select id="toolbox-bottom-advanced-format" toolbox-focus-input="toolbox-bottom-input" ng-model="$parent.toolboxBottom.newElementConfig.format">
+                    <md-option ng-repeat="format in $parent.toolboxBottom.newElementConfig.formats" value="{{format}}">
+                        {{format}}
+                    </md-option>
+                </md-select>
+            </md-input-container>
+
         </script>
 
         <script type="text/ng-template" id="enum.html">

app/src/components/toolbox/toolbox.html

@@ -17,7 +17,8 @@ module app.toolbox {
                 'allowsAdvanced': true,
                 'required': false,
                 'allowsEnum': true,
-                'enum': []
+                'enum': [],
+                'formats': ['date-time']
             },
             'integer': {
                 'allowsAdvanced': true,
@@ -67,8 +68,7 @@ module app.toolbox {
             this.showEnum = false;
         }
 
-        //TODO support different scopes(inside folders)
-        //TODO add more data into content(required, min chars, etc)
+
         /**
          * Submits the current newElementLabel and newElementTypeLabel and creates a new DataschemaPropery.
          */