Included type error fixed

Author: jisoldi

dist/scripts/api-console.js

@@ -820,18 +820,20 @@
           return [arrayType.items];
         };
 
-        $scope.getType = function (type) {
-          var newType = $scope.mergeType(type);
-          newType.type = RAML.Inspector.Types.ensureArray(newType.type);
+        $scope.getType = function (property) {
+          var newProperty = $scope.mergeProperty(property);
+          newProperty.type = RAML.Inspector.Types.ensureArray(newProperty.type);
 
-          if (newType.type[0] === 'array') {
-            newType.type = getArrayTypes(newType).map(function (aType) {
+          if (newProperty.type[0].type) { newProperty.type = newProperty.type[0].type; }
+
+          if (newProperty.type[0] === 'array') {
+            newProperty.type = getArrayTypes(newProperty).map(function (aType) {
               return aType + '[]';
             });
-            newType.properties = newType.items.properties;
+            newProperty.properties = newProperty.items.properties;
           }
 
-          return newType;
+          return newProperty;
         };
 
         var isPattern = function (propertyName) {
@@ -842,13 +844,13 @@
           return ($scope.showSecuritySchemaProperties || !property[0].isFromSecurityScheme) && !isPattern(property[0].displayName);
         };
 
-        $scope.mergeType = function (type) {
-          var newType = angular.copy(type);
+        $scope.mergeProperty = function (property) {
+          var newProperty = angular.copy(property);
 
           if (!$scope.isNestedProperty && $rootScope.types) {
-            return RAML.Inspector.Types.mergeType(newType, $rootScope.types);
+            return RAML.Inspector.Types.mergeType(newProperty, $rootScope.types);
           }
-          return newType;
+          return newProperty;
         };
 
         $scope.isNativeType = RAML.Inspector.Types.isNativeType;
@@ -2704,7 +2706,7 @@
           $rootScope.$broadcast(TOGGLE_POPOVER);
 
           $timeout(function () {
-            $scope.selectedType = RAML.Inspector.Types.mergeType({
+            $scope.selectedType = RAML.Inspector.Types.mergeProperty({
                 displayName: type,
                 type: [type]
               },
@@ -7157,7 +7159,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
     "  <h1 ng-if=\"!disableTitle\" class=\"raml-console-title\">{{raml.title}}</h1>\n" +
     "\n" +
     "\n" +
-    "  <div ng-if=\"!disableDescription\" ng-init=\"actualSize = descriptionLimit\" >\n" +
+    "  <div ng-if=\"!disableDescription && !!raml.description\" ng-init=\"actualSize = descriptionLimit\" >\n" +
     "    <div class=\"raml-console-root-description\" markdown=\"raml.description | limitTo : actualSize\"></div>\n" +
     "    <span>\n" +
     "      <a class=\"raml-console-show-more-less\"\n" +

src/app/directives/properties.js

@@ -38,18 +38,20 @@
           return [arrayType.items];
         };
 
-        $scope.getType = function (type) {
-          var newType = $scope.mergeType(type);
-          newType.type = RAML.Inspector.Types.ensureArray(newType.type);
+        $scope.getType = function (property) {
+          var newProperty = $scope.mergeProperty(property);
+          newProperty.type = RAML.Inspector.Types.ensureArray(newProperty.type);
 
-          if (newType.type[0] === 'array') {
-            newType.type = getArrayTypes(newType).map(function (aType) {
+          if (newProperty.type[0].type) { newProperty.type = newProperty.type[0].type; }
+
+          if (newProperty.type[0] === 'array') {
+            newProperty.type = getArrayTypes(newProperty).map(function (aType) {
               return aType + '[]';
             });
-            newType.properties = newType.items.properties;
+            newProperty.properties = newProperty.items.properties;
           }
 
-          return newType;
+          return newProperty;
         };
 
         var isPattern = function (propertyName) {
@@ -60,13 +62,13 @@
           return ($scope.showSecuritySchemaProperties || !property[0].isFromSecurityScheme) && !isPattern(property[0].displayName);
         };
 
-        $scope.mergeType = function (type) {
-          var newType = angular.copy(type);
+        $scope.mergeProperty = function (property) {
+          var newProperty = angular.copy(property);
 
           if (!$scope.isNestedProperty && $rootScope.types) {
-            return RAML.Inspector.Types.mergeType(newType, $rootScope.types);
+            return RAML.Inspector.Types.mergeType(newProperty, $rootScope.types);
           }
-          return newType;
+          return newProperty;
         };
 
         $scope.isNativeType = RAML.Inspector.Types.isNativeType;

src/app/directives/raml-console.tpl.html

@@ -7,7 +7,7 @@
   <h1 ng-if="!disableTitle" class="raml-console-title">{{raml.title}}</h1>
 
 
-  <div ng-if="!disableDescription" ng-init="actualSize = descriptionLimit" >
+  <div ng-if="!disableDescription && !!raml.description" ng-init="actualSize = descriptionLimit" >
     <div class="raml-console-root-description" markdown="raml.description | limitTo : actualSize"></div>
     <span>
       <a class="raml-console-show-more-less"

src/app/directives/type.js

@@ -49,7 +49,7 @@
           $rootScope.$broadcast(TOGGLE_POPOVER);
 
           $timeout(function () {
-            $scope.selectedType = RAML.Inspector.Types.mergeType({
+            $scope.selectedType = RAML.Inspector.Types.mergeProperty({
                 displayName: type,
                 type: [type]
               },