Merge pull request #503 from mulesoft/develop

Update console and version

Author: agustinlg

bower.json

@@ -10,7 +10,7 @@
     "angular": "~1.3.17",
     "angular-bootstrap": ">=0.11.0 <0.14.0",
     "angular-ui-tree": "2.1.5",
-    "api-console": "mulesoft/api-console#v3.0.20",
+    "api-console": "mulesoft/api-console#v3.0.21",
     "es5-shim": "~2.3.0",
     "file-saver.js": "~1.20150304.1",
     "font-awesome": "~4.0.3",

dist/scripts/api-designer-vendor.js

@@ -81763,25 +81763,47 @@ exports.javascript = require('./javascript');
       scope: {
         markdown: '='
       },
-      controller: ['$scope', '$sanitize', '$window', '$element', function($scope, $sanitize, $window, $element) {
-        $scope.$watch('markdown', function (markdown) {
-          var allowUnsafeMarkdown = $scope.$parent.allowUnsafeMarkdown;
+      controller: 'MarkdownController'
+    };
+  };
 
-          var markdownString = typeof markdown === 'string' ? markdown || '' : '';
-          var html = $window.marked(markdownString, RAML.Settings.marked);
+  RAML.Directives.markdownString = function () {
+    return {
+      restrict: 'A',
+      scope: {
+        markdownString: '@'
+      },
+      controller: 'MarkdownStringController'
+    };
+  };
 
-          if (!allowUnsafeMarkdown) {
-            html = $sanitize(html);
-          }
+  var watchMarkdown = function(expression, $scope, $window, $sanitize, $element) {
+    $scope.$watch(expression, function (markdown) {
+      var allowUnsafeMarkdown = $scope.$parent.allowUnsafeMarkdown;
+      var markdownString = typeof markdown === 'string' ? markdown || '' : '';
+      var html = $window.marked(markdownString, RAML.Settings.marked);
 
-          $element.html(html);
-        });
-      }]
-    };
+      if (!allowUnsafeMarkdown) {
+        html = $sanitize(html);
+      }
+
+      $element.html(html);
+    });
   };
 
+  function controller($scope, $sanitize, $window, $element) {
+    watchMarkdown('markdown', $scope, $window, $sanitize, $element);
+  }
+
+  function stringController($scope, $sanitize, $window, $element) {
+    watchMarkdown('markdownString', $scope, $window, $sanitize, $element);
+  }
+
   angular.module('RAML.Directives')
-    .directive('markdown', RAML.Directives.markdown);
+    .controller('MarkdownController', controller)
+    .controller('MarkdownStringController', stringController)
+    .directive('markdown', RAML.Directives.markdown)
+    .directive('markdownString', RAML.Directives.markdownString);
 })();
 
 (function () {
@@ -83032,7 +83054,7 @@ exports.javascript = require('./javascript');
     element.append(resourceHeadingElement(resource, currentId));
     element.append(resourceTypeElement(resource));
     element.append(resourceHeadingFlagElement($scope, resource));
-    element.append(resourceLevelDescriptionElement(resource));
+    element.append(resourceLevelDescriptionElement($scope, $compile, resource));
     element.append(methodListElement($scope, resource, currentId, showResource, resourceId));
     element.append(closeMethodButton($scope, resource, currentId, showResource, resourceId));
 
@@ -83056,9 +83078,12 @@ exports.javascript = require('./javascript');
     return '';
   }
 
-  function resourceLevelDescriptionElement(resource) {
+  function resourceLevelDescriptionElement($scope, $compile, resource) {
     var element = angular.element('<span class="raml-console-resource-level-description raml-console-marked-content"></span>');
-    element.append(angular.element('<p>' + resource.description + '</p>'));
+    element.attr('markdown-string', resource.description);
+
+    $compile(element)($scope);
+
     return element;
   }
 

dist/scripts/api-designer-vendor.min.js

@@ -1,6 +1,6 @@
 {
   "name": "api-designer",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "A web editor for creating and sharing RAML API specifications",
   "repository": {
     "type": "git",