Fix resource level documentation for childnodes

Author: Javier Centurion

dist/examples/leagues.raml

@@ -318,8 +318,8 @@ securedBy: [ basic, digest_auth, oauth_2_0 ]
 
   /{teamId}:
     displayName: Team
-    #description: |
-    #  The team is the basic unit for keeping track of a roster of players that are participating together in La Liga. With the Team APIs, you can obtain team-related information, like the team name, stats, points, and more.
+    description: |
+     The team is the basic unit for keeping track of a roster of players that are participating together in La Liga. With the Team APIs, you can obtain team-related information, like the team name, stats, points, and more.
     uriParameters:
       teamId:
         description: |

dist/scripts/api-console-vendor.js

@@ -20,7 +20,7 @@ var block = {
   lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
   blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,
   list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
-  html: /^ *(?:comment|closed|closing) *(?:\n{2,}|\s*$)/,
+  html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,
   def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
   table: noop,
   paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,
@@ -868,7 +868,7 @@ Renderer.prototype.link = function(href, title, text) {
     } catch (e) {
       return '';
     }
-    if (prot.indexOf('javascript:') === 0) {
+    if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0) {
       return '';
     }
   }
@@ -1154,8 +1154,13 @@ function marked(src, opt, callback) {
 
     pending = tokens.length;
 
-    var done = function() {
-      var out, err;
+    var done = function(err) {
+      if (err) {
+        opt.highlight = highlight;
+        return callback(err);
+      }
+
+      var out;
 
       try {
         out = Parser.parse(tokens, opt);
@@ -1184,6 +1189,7 @@ function marked(src, opt, callback) {
           return --pending || done();
         }
         return highlight(token.text, token.lang, function(err, code) {
+          if (err) return done(err);
           if (code == null || code === token.text) {
             return --pending || done();
           }
@@ -1253,7 +1259,7 @@ marked.inlineLexer = InlineLexer.output;
 
 marked.parse = marked;
 
-if (typeof exports === 'object') {
+if (typeof module !== 'undefined' && typeof exports === 'object') {
   module.exports = marked;
 } else if (typeof define === 'function' && define.amd) {
   define(function() { return marked; });
@@ -40225,7 +40231,7 @@ CodeMirror.defineMIME("text/x-yaml", "yaml");
 })();
 
 /**
- * @license AngularJS v1.2.28
+ * @license AngularJS v1.2.29-build.590+sha.e81b2f7
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
@@ -40294,7 +40300,7 @@ function minErr(module) {
       return match;
     });
 
-    message = message + '\nhttp://errors.angularjs.org/1.2.28/' +
+    message = message + '\nhttp://errors.angularjs.org/1.2.29-build.590+sha.e81b2f7/' +
       (module ? module + '/' : '') + code;
     for (i = 2; i < arguments.length; i++) {
       message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' +
@@ -40708,6 +40714,8 @@ noop.$inject = [];
        return (transformationFn || angular.identity)(value);
      };
    ```
+  * @param {*} value to be returned.
+  * @returns {*} the value passed in.
  */
 function identity($) {return $;}
 identity.$inject = [];
@@ -42213,11 +42221,11 @@ function setupModuleLoader(window) {
  * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
  */
 var version = {
-  full: '1.2.28',    // all of these placeholder strings will be replaced by grunt's
+  full: '1.2.29-build.590+sha.e81b2f7',    // all of these placeholder strings will be replaced by grunt's
   major: 1,    // package task
   minor: 2,
-  dot: 28,
-  codeName: 'finnish-disembarkation'
+  dot: 29,
+  codeName: 'snapshot'
 };
 
 
@@ -44649,6 +44657,11 @@ function Browser(window, document, $log, $sniffer) {
     }
   }
 
+  function getHash(url) {
+    var index = url.indexOf('#');
+    return index === -1 ? '' : url.substr(index + 1);
+  }
+
   /**
    * @private
    * Note: this method is used only by scenario runner
@@ -44760,8 +44773,10 @@ function Browser(window, document, $log, $sniffer) {
         }
         if (replace) {
           location.replace(url);
-        } else {
+        } else if (!sameBase) {
           location.href = url;
+        } else {
+          location.hash = getHash(url);
         }
       }
       return self;
@@ -49516,6 +49531,10 @@ function stripHash(url) {
   return index == -1 ? url : url.substr(0, index);
 }
 
+function trimEmptyHash(url) {
+  return url.replace(/(#.+)|#$/, '$1');
+}
+
 
 function stripFile(url) {
   return url.substr(0, stripHash(url).lastIndexOf('/') + 1);
@@ -50172,10 +50191,11 @@ function $LocationProvider(){
     // update browser
     var changeCounter = 0;
     $rootScope.$watch(function $locationWatch() {
-      var oldUrl = $browser.url();
+      var oldUrl = trimEmptyHash($browser.url());
+      var newUrl = trimEmptyHash($location.absUrl());
       var currentReplace = $location.$$replace;
 
-      if (!changeCounter || oldUrl != $location.absUrl()) {
+      if (!changeCounter || oldUrl != newUrl) {
         changeCounter++;
         $rootScope.$evalAsync(function() {
           if ($rootScope.$broadcast('$locationChangeStart', $location.absUrl(), oldUrl).
@@ -55774,37 +55794,12 @@ function limitToFilter(){
       limit = int(limit);
     }
 
-    if (isString(input)) {
-      //NaN check on limit
-      if (limit) {
-        return limit >= 0 ? input.slice(0, limit) : input.slice(limit, input.length);
-      } else {
-        return "";
-      }
-    }
-
-    var out = [],
-      i, n;
-
-    // if abs(limit) exceeds maximum length, trim it
-    if (limit > input.length)
-      limit = input.length;
-    else if (limit < -input.length)
-      limit = -input.length;
-
-    if (limit > 0) {
-      i = 0;
-      n = limit;
+    //NaN check on limit
+    if (limit) {
+      return limit > 0 ? input.slice(0, limit) : input.slice(limit);
     } else {
-      i = input.length + limit;
-      n = input.length;
+      return isString(input) ? "" : [];
     }
-
-    for (; i<n; i++) {
-      out.push(input[i]);
-    }
-
-    return out;
   };
 }
 
@@ -60077,7 +60072,7 @@ var ngIfDirective = ['$animate', function($animate) {
        <select ng-model="template" ng-options="t.name for t in templates">
         <option value="">(blank)</option>
        </select>
-       url of the template: <tt>{{template.url}}</tt>
+       url of the template: <code>{{template.url}}</code>
        <hr/>
        <div class="slide-animate-container">
          <div class="slide-animate" ng-include="template.url"></div>

dist/scripts/api-console.js

@@ -5269,7 +5269,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
     "        <li ng-repeat=\"header in content\" class=\"raml-console-resource-list-item\">\n" +
     "           <div class=\"raml-console-resource raml-console-clearfix raml-console-documentation-clearfix\">\n" +
     "            <div class=\"raml-console-resource-path-container raml-console-documentation-path-container\">\n" +
-    "              <h3 class=\"raml-console-resource-heading raml-console-md-heading-{{header.heading}}\">\n" +
+    "              <h3 class=\"raml-console-resource-heading raml-console-documentation-heading raml-console-md-heading-{{header.heading}}\">\n" +
     "                <div class=\"raml-console-resource-path-active\">\n" +
     "                  <div class=\"raml-consoledocumentation-title\" ng-click=\"showSection($event, header.value, doc.title)\">{{header.label}}</div>\n" +
     "                </div>\n" +
@@ -5552,7 +5552,7 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
     "          <li id=\"{{generateId(resource.pathSegments)}}\" class=\"raml-console-resource-list-item\" ng-repeat=\"resource in resourceGroup\" ng-if=\"!$first\">\n" +
     "            <div class=\"raml-console-resource raml-console-clearfix\" ng-class=\"{ 'raml-console-is-active':showPanel }\">\n" +
     "              <div class=\"raml-console-resource-path-container\">\n" +
-    "                <h3 class=\"raml-console-resource-heading\">\n" +
+    "                <h3 class=\"raml-console-resource-heading\" ng-click=\"showResourceDescription($event)\" ng-class=\"{'raml-console-resource-heading-hover':resource.description}\">\n" +
     "                  <span ng-repeat-start='segment in resource.pathSegments' ng-if=\"!$last\">{{segment.toString()}}</span><span ng-repeat-end ng-if=\"$last\" class=\"raml-console-resource-path-active\">{{segment.toString()}}</span>\n" +
     "                </h3>\n" +
     "\n" +
@@ -5564,6 +5564,13 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
     "              <close-button></close-button>\n" +
     "            </div>\n" +
     "\n" +
+    "            <span class=\"raml-console-resource-list-item raml-console-resource-description\" ng-show=\"resourceGroup.length > 1\" ng-if=\"resource.description\">\n" +
+    "              <div class=\"raml-console-resource-panel-primary-row raml-console-resource-panel-content raml-console-is-active\">\n" +
+    "                <h3 class=\"raml-console-resource-heading-a\">Description</h3>\n" +
+    "                <p marked=\"resource.description\" opts=\"markedOptions\"></p>\n" +
+    "              </div>\n" +
+    "            </span>\n" +
+    "\n" +
     "            <resource-panel></resource-panel>\n" +
     "          </li>\n" +
     "        </ol>\n" +

dist/styles/api-console-dark-theme.css

@@ -2096,10 +2096,6 @@ ol.raml-console-resources-container {
   }
 }
 
-span.raml-console-resource-path-active {
-  cursor: default;
-}
-
 a.raml-console-resource-path-active {
   cursor: pointer;
 }
@@ -4152,6 +4148,10 @@ span.raml-console-side-bar-required-field {
   }
 }
 
+.raml-console-documentation-heading:hover {
+  cursor: pointer;
+}
+
 .raml-console-documentation-header {
   background: #252f3f;
   position: relative;

dist/styles/api-console-light-theme.css

@@ -2096,10 +2096,6 @@ ol.raml-console-resources-container {
   }
 }
 
-span.raml-console-resource-path-active {
-  cursor: default;
-}
-
 a.raml-console-resource-path-active {
   cursor: pointer;
 }
@@ -4152,6 +4148,10 @@ span.raml-console-side-bar-required-field {
   }
 }
 
+.raml-console-documentation-heading:hover {
+  cursor: pointer;
+}
+
 .raml-console-documentation-header {
   background: #e0e0e0;
   position: relative;

src/app/directives/root-documentation.tpl.html

@@ -38,7 +38,7 @@ <h3 class="raml-console-resource-heading">
         <li ng-repeat="header in content" class="raml-console-resource-list-item">
            <div class="raml-console-resource raml-console-clearfix raml-console-documentation-clearfix">
             <div class="raml-console-resource-path-container raml-console-documentation-path-container">
-              <h3 class="raml-console-resource-heading raml-console-md-heading-{{header.heading}}">
+              <h3 class="raml-console-resource-heading raml-console-documentation-heading raml-console-md-heading-{{header.heading}}">
                 <div class="raml-console-resource-path-active">
                   <div class="raml-consoledocumentation-title" ng-click="showSection($event, header.value, doc.title)">{{header.label}}</div>
                 </div>

src/app/resources/resources.tpl.html

@@ -71,7 +71,7 @@ <h3 class="raml-console-resource-heading-a">Description</h3>
           <li id="{{generateId(resource.pathSegments)}}" class="raml-console-resource-list-item" ng-repeat="resource in resourceGroup" ng-if="!$first">
             <div class="raml-console-resource raml-console-clearfix" ng-class="{ 'raml-console-is-active':showPanel }">
               <div class="raml-console-resource-path-container">
-                <h3 class="raml-console-resource-heading">
+                <h3 class="raml-console-resource-heading" ng-click="showResourceDescription($event)" ng-class="{'raml-console-resource-heading-hover':resource.description}">
                   <span ng-repeat-start='segment in resource.pathSegments' ng-if="!$last">{{segment.toString()}}</span><span ng-repeat-end ng-if="$last" class="raml-console-resource-path-active">{{segment.toString()}}</span>
                 </h3>
 
@@ -83,6 +83,13 @@ <h3 class="raml-console-resource-heading">
               <close-button></close-button>
             </div>
 
+            <span class="raml-console-resource-list-item raml-console-resource-description" ng-show="resourceGroup.length > 1" ng-if="resource.description">
+              <div class="raml-console-resource-panel-primary-row raml-console-resource-panel-content raml-console-is-active">
+                <h3 class="raml-console-resource-heading-a">Description</h3>
+                <p marked="resource.description" opts="markedOptions"></p>
+              </div>
+            </span>
+
             <resource-panel></resource-panel>
           </li>
         </ol>

src/assets/examples/leagues.raml

@@ -318,8 +318,8 @@ securedBy: [ basic, digest_auth, oauth_2_0 ]
 
   /{teamId}:
     displayName: Team
-    #description: |
-    #  The team is the basic unit for keeping track of a roster of players that are participating together in La Liga. With the Team APIs, you can obtain team-related information, like the team name, stats, points, and more.
+    description: |
+     The team is the basic unit for keeping track of a roster of players that are participating together in La Liga. With the Team APIs, you can obtain team-related information, like the team name, stats, points, and more.
     uriParameters:
       teamId:
         description: |

src/scss/_documentation.scss

@@ -55,6 +55,10 @@
   }
 }
 
+.documentation-heading:hover {
+  cursor: pointer;
+}
+
 .documentation-header {
   background: $color-console-documentation-header;
   position: relative;

src/scss/_resource.scss

@@ -344,10 +344,6 @@ ol.resources-container {
   }
 }
 
-span.resource-path-active {
-  cursor: default;
-}
-
 a.resource-path-active {
   cursor: pointer;
 }