Rewrote the gh-pages demo site

shattar · Sep 24, 2015 · 0247bd9 · 0247bd9
1 parent 60b4814
commit 0247bd9
Show file tree

Hide file tree

Showing 1,689 changed files with 560,855 additions and 40 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "tests/bower_components"
+  "directory": "www/bower_components"
 }
diff --git a/bower.json b/bower.json
@@ -40,7 +40,11 @@
     "/index.html",
     "/package.json"
   ],
-  "dependencies": {},
+  "dependencies": {
+    "ace-builds": "https://github.com/ajaxorg/ace-builds.git#~1.2.0",
+    "bootstrap-sass": "~3.3.5",
+    "jquery": "~2.1.4"
+  },
   "devDependencies": {
     "chai": "*",
     "mocha": "*",

diff --git a/dist/swagger-parser.js b/dist/swagger-parser.js
@@ -13601,7 +13601,7 @@ module.exports = new Type('tag:yaml.org,2002:timestamp', {
 
 },{"../type":38}],55:[function(require,module,exports){
 /**!
- * JSON Schema $Ref Parser v1.1.0
+ * JSON Schema $Ref Parser v1.2.1
  *
  * @link https://github.com/BigstickCarpet/json-schema-ref-parser
  * @license MIT
@@ -13757,7 +13757,7 @@ function crawl(obj, path, parents, $refs, options) {
         // Check for circular references
         var circular = pointer.circular || parents.indexOf(pointer.value) !== -1;
         $refs.circular = $refs.circular || true;
-        if (!options.allow.circular) {
+        if (!options.$refs.circular) {
           throw ono.reference('Circular $ref pointer found at %s', keyPath);
         }
 
@@ -14121,14 +14121,7 @@ function $RefParserOptions(options) {
      * If false, then an error will be thrown.
      * @type {boolean}
      */
-    unknown: true,
-
-    /**
-     * Allow circular (recursive) JSON references?
-     * If false, then a {@link ReferenceError} will be thrown if a circular reference is found.
-     * @type {boolean}
-     */
-    circular: true
+    unknown: true
   };
 
   /**
@@ -14145,7 +14138,14 @@ function $RefParserOptions(options) {
      * Allow JSON references to external files/URLs?
      * @type {boolean}
      */
-    external: true
+    external: true,
+
+    /**
+     * Allow circular (recursive) JSON references?
+     * If false, then a {@link ReferenceError} will be thrown if a circular reference is found.
+     * @type {boolean}
+     */
+    circular: true
   };
 
   /**

diff --git a/dist/swagger-parser.js.map b/dist/swagger-parser.js.map
diff --git a/dist/swagger-parser.min.js b/dist/swagger-parser.min.js
diff --git a/dist/swagger-parser.min.js.map b/dist/swagger-parser.min.js.map
diff --git a/index.html b/index.html
@@ -1,10 +1,10 @@
 <html>
     <head>
-        <meta http-equiv="refresh" content="0; url=tests/index.html">
+        <meta http-equiv="refresh" content="0; url=www/index.html">
     </head>
-    <body>
+    <body bgcolor="#333333">
         <script>
-            window.location = 'tests/index.html';
+            window.location = 'www/index.html';
         </script>
     </body>
 </html>
diff --git a/karma.conf.js b/karma.conf.js
@@ -7,8 +7,8 @@ var baseConfig = {
   reporters: ['mocha'],
   files: [
     // Third-Party Libraries
-    'tests/bower_components/chai/chai.js',
-    'tests/bower_components/sinon-js/sinon.js',
+    'www/bower_components/chai/chai.js',
+    'www/bower_components/sinon-js/sinon.js',
 
     // Swagger Parser
     'dist/swagger-parser.min.js',

diff --git a/package.json b/package.json
@@ -26,9 +26,12 @@
   "main": "lib/index.js",
   "scripts": {
     "lint": "jshint . --verbose && jscs . --verbose",
-    "build": "npm run lint && npm run browserify",
+    "build": "npm run lint && npm run browserify && npm run build-www",
+    "build-www": "npm run sass && npm run browserify-www",
     "browserify": "simplifyify lib/index.js --outfile dist/swagger-parser.js --standalone SwaggerParser --debug --minify",
-    "watch": "npm run browserify -- --watch",
+    "browserify-www": "simplifyify www/js/index.js --outfile www/js/bundle.js --debug --minify",
+    "watch": "npm run browserify -- --watch & npm run browserify-www -- --watch",
+    "sass": "node-sass --source-map true --output-style compressed www/css/style.scss www/css/style.min.css",
     "mocha": "mocha --bail --recursive tests/fixtures tests/specs",
     "istanbul": "istanbul cover _mocha --dir coverage/node -- --bail --recursive tests/fixtures tests/specs",
     "karma": "karma start --single-run",
@@ -60,6 +63,7 @@
     "karma-safari-launcher": "^0.1.1",
     "karma-sauce-launcher": "^0.2.14",
     "mocha": "^2.3.2",
+    "node-sass": "^3.3.3",
     "npm-check-updates": "^2.2.3",
     "phantomjs": "^1.9.18",
     "simplifyify": "^1.4.1",

diff --git a/tests/index.html b/tests/index.html
@@ -7,15 +7,15 @@
 
     <title>Swagger Parser Tests</title>
 
-    <link rel="stylesheet" href="bower_components/mocha/mocha.css"/>
+    <link rel="stylesheet" href="../www/bower_components/mocha/mocha.css"/>
   </head>
   <body>
     <div id="mocha"></div>
 
     <!-- Third-Party Libraries -->
-    <script src="bower_components/mocha/mocha.js"></script>
-    <script src="bower_components/chai/chai.js"></script>
-    <script src="bower_components/sinon-js/sinon.js"></script>
+    <script src="../www/bower_components/mocha/mocha.js"></script>
+    <script src="../www/bower_components/chai/chai.js"></script>
+    <script src="../www/bower_components/sinon-js/sinon.js"></script>
 
     <!-- Swagger Parser -->
     <script src="../dist/swagger-parser.js"></script>

diff --git a/www/bower_components/ace-builds/.bower.json b/www/bower_components/ace-builds/.bower.json
@@ -0,0 +1,15 @@
+{
+  "name": "ace-builds",
+  "homepage": "https://github.com/ajaxorg/ace-builds",
+  "version": "1.2.0",
+  "_release": "1.2.0",
+  "_resolution": {
+    "type": "version",
+    "tag": "v1.2.0",
+    "commit": "0982db4853e3c967756b83b70638b9761d7f801d"
+  },
+  "_source": "https://github.com/ajaxorg/ace-builds.git",
+  "_target": "~1.2.0",
+  "_originalSource": "https://github.com/ajaxorg/ace-builds.git",
+  "_direct": true
+}