Fix request tab info on try-it when using oAuth 2.0

jcenturion · jcenturion · commit c01871e4cfff · 2015-01-28T17:19:41.000-03:00
diff --git a/dist/index.html b/dist/index.html
@@ -7,7 +7,7 @@
   <link href="styles/api-console-light-theme.css" rel="stylesheet" class="theme">
 </head>
 <body ng-app="ramlConsoleApp" ng-cloak class="raml-console-body">
-  <raml-console single-view src="https://qa.anypoint.mulesoft.com/apiplatform/repository/public/organizations/121/apis/2951/versions/3337/files/root"></raml-console>
+  <raml-initializer></raml-initializer>
   <script src="scripts/api-console-vendor.js"></script>
   <script src="scripts/api-console.js"></script>
   <script>
diff --git a/dist/scripts/api-console-vendor.js b/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 *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,
+  html: /^ *(?:comment|closed|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 || prot.indexOf('vbscript:') === 0) {
+    if (prot.indexOf('javascript:') === 0) {
       return '';
     }
   }
@@ -1154,13 +1154,8 @@ function marked(src, opt, callback) {
 
     pending = tokens.length;
 
-    var done = function(err) {
-      if (err) {
-        opt.highlight = highlight;
-        return callback(err);
-      }
-
-      var out;
+    var done = function() {
+      var out, err;
 
       try {
         out = Parser.parse(tokens, opt);
@@ -1189,7 +1184,6 @@ 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();
           }
@@ -1259,7 +1253,7 @@ marked.inlineLexer = InlineLexer.output;
 
 marked.parse = marked;
 
-if (typeof module !== 'undefined' && typeof exports === 'object') {
+if (typeof exports === 'object') {
   module.exports = marked;
 } else if (typeof define === 'function' && define.amd) {
   define(function() { return marked; });
diff --git a/dist/scripts/api-console.js b/dist/scripts/api-console.js
@@ -1184,14 +1184,17 @@
               //// TODO: Make a uniform interface
               if (scheme && scheme.type === 'OAuth 2.0') {
                 authStrategy = new RAML.Client.AuthStrategies.Oauth2(scheme, $scope.credentials);
-                authStrategy.authenticate(request.toOptions(), handleResponse);
+                authStrategy.authenticate(request.toOptions(), function (jqXhr) {
+                  $scope.requestOptions = request.toOptions();
+                  handleResponse(jqXhr);
+                });
                 return;
               }
 
               authStrategy = RAML.Client.AuthStrategies.for(scheme, $scope.credentials);
               authStrategy.authenticate().then(function(token) {
                 token.sign(request);
-
+                $scope.requestOptions = request.toOptions();
                 jQuery.ajax(request.toOptions()).then(
                   function(data, textStatus, jqXhr) { handleResponse(jqXhr); },
                   function(jqXhr) { handleResponse(jqXhr); }
diff --git a/src/app/directives/sidebar.js b/src/app/directives/sidebar.js
@@ -324,14 +324,17 @@
               //// TODO: Make a uniform interface
               if (scheme && scheme.type === 'OAuth 2.0') {
                 authStrategy = new RAML.Client.AuthStrategies.Oauth2(scheme, $scope.credentials);
-                authStrategy.authenticate(request.toOptions(), handleResponse);
+                authStrategy.authenticate(request.toOptions(), function (jqXhr) {
+                  $scope.requestOptions = request.toOptions();
+                  handleResponse(jqXhr);
+                });
                 return;
               }
 
               authStrategy = RAML.Client.AuthStrategies.for(scheme, $scope.credentials);
               authStrategy.authenticate().then(function(token) {
                 token.sign(request);
-
+                $scope.requestOptions = request.toOptions();
                 jQuery.ajax(request.toOptions()).then(
                   function(data, textStatus, jqXhr) { handleResponse(jqXhr); },
                   function(jqXhr) { handleResponse(jqXhr); }
