Merge remote-tracking branch 'upstream/develop' into feature/display-api-description

Author: Hadrien Kohl

README.md

@@ -91,43 +91,49 @@ Add the following in a similar manner as proxying or OAuth 2.0 to ignore markdow
 
 In *Single View* mode you will be able to see only documentation or try-it.
 
-    <raml-console-loader src="path-to-raml" single-view></raml-console-loader>
+    <raml-console-loader src="path-to-raml" options="{ singleView: true }"></raml-console-loader>
 
 ### Theme Switcher
 
 *Theme Switcher* can be disable if needed by adding the following setting:
 
-    <raml-console-loader src="path-to-raml" disable-theme-switcher></raml-console-loader>
+    <raml-console-loader src="path-to-raml" options="{ disableThemeSwitcher: true }"></raml-console-loader>
 
 ### Disabling Client Generator
 
 *Raml client generator* can be disable if needed by adding the following setting:
 
-    <raml-console-loader src="path-to-raml" disable-raml-client-generator></raml-console-loader>
+    <raml-console-loader src="path-to-raml" options="{ disableRamlClientGenerator: true }"></raml-console-loader>
 
 ### Resources collapsed
 
 *Resources* can be collapsed if needed by adding the following setting:
 
-    <raml-console-loader src="path-to-raml" resources-collapsed></raml-console-loader>
+    <raml-console-loader src="path-to-raml" options="{ resourceCollapsed: true }"></raml-console-loader>
 
 ### Documentation collapsed
 
 *Documentation* can be collapsed if needed by adding the following setting:
 
-    <raml-console-loader src="path-to-raml" documentation-collapsed></raml-console-loader>
+    <raml-console-loader src="path-to-raml" options="{ documentationCollapsed: true }"></raml-console-loader>
 
 ### Allowing Unsafe Markdown
 
 *Unsafe Markdown* will be disable by default, if you want to allow unsafe content check the following example:
 
-    <raml-console-loader src="path-to-raml" allow-unsafe-markdown></raml-console-loader>    
+    <raml-console-loader src="path-to-raml" options="{ allowUnsafeMarkdown: true }"></raml-console-loader>    
 
 ### Disabling Try-it
 
 *Try-it* will be enable by default, if you want to disable Try-it you can do that by adding the following setting:
 
-    <raml-console-loader src="path-to-raml" disable-try-it></raml-console-loader>    
+    <raml-console-loader src="path-to-raml" options="{ disableTryIt: true }"></raml-console-loader>    
+
+### Multiple Options
+
+Multiple of the options above can be provided. The options need to be expressed in camelcase format:
+
+    <raml-console-loader src="path-to-raml" options="{ disableRamlClientGenerator: true, disableTryIt: true }"></raml-console-loader> 
 
 ## Development
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "api-console",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/mulesoft/api-console.git"
@@ -22,7 +22,7 @@
     "jszip": "~2.0.0",
     "marked": "~0.3.1",
     "raml-client-generator": "~0.0.7",
-    "raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.1.9/raml-1-parser.zip",
+    "raml-1-parser": "https://github.com/raml-org/raml-js-parser-2/releases/download/1.1.12/raml-1-parser.zip",
     "resolve-url": "~0.2.1",
     "slug": "~0.8.0",
     "velocity": "~1.1.0",

dist/scripts/api-console-vendor.js

@@ -1,6 +1,6 @@
 {
   "name": "api-console",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "Api-Console for RAML based app",
   "files": [
     "dist",