From e2bf2c4578435382d82039498b1a81475272acf5 Mon Sep 17 00:00:00 2001
From: Doug Fritz <dougfritz@google.com>
Date: Wed, 10 Sep 2014 15:51:48 -0700
Subject: [PATCH] rename gui.html and gui.js to dat-gui.html and dat-gui.js

---
 bower.json                       |  1 +
 build/{gui.html => dat-gui.html} |  0
 build/{gui.js => dat-gui.js}     |  0
 build/gui.shim.js                |  1 -
 gui.html => dat-gui.html         |  0
 docs/template.html               |  4 ++--
 examples/index.html              | 17 ++---------------
 gulpfile.js                      | 10 +++++-----
 index.html                       |  8 ++++----
 9 files changed, 14 insertions(+), 27 deletions(-)
 rename build/{gui.html => dat-gui.html} (100%)
 mode change 100755 => 100644
 rename build/{gui.js => dat-gui.js} (100%)
 mode change 100755 => 100644
 delete mode 100644 build/gui.shim.js
 rename gui.html => dat-gui.html (100%)

diff --git a/bower.json b/bower.json
index ba18a8b..8442892 100644
--- a/bower.json
+++ b/bower.json
@@ -10,6 +10,7 @@
     ],
     "license": "MIT",
     "private": true,
+    "main": "gui.html",
     "ignore": [
         "**/.*",
         "node_modules",
diff --git a/build/gui.html b/build/dat-gui.html
old mode 100755
new mode 100644
similarity index 100%
rename from build/gui.html
rename to build/dat-gui.html
diff --git a/build/gui.js b/build/dat-gui.js
old mode 100755
new mode 100644
similarity index 100%
rename from build/gui.js
rename to build/dat-gui.js
diff --git a/build/gui.shim.js b/build/gui.shim.js
deleted file mode 100644
index 123c7d6..0000000
--- a/build/gui.shim.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t){"use strict";var n=function(){this.vars={}};n.ready=function(t){t()},n.prototype.var=function(t,n){return this.vars[t]=n,i},n.prototype.add=function(){return i};var r=function(){return this},i={on:r};t.Gui=n}(this);
\ No newline at end of file
diff --git a/gui.html b/dat-gui.html
similarity index 100%
rename from gui.html
rename to dat-gui.html
diff --git a/docs/template.html b/docs/template.html
index 586d39b..c081189 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -6,7 +6,7 @@
 
 <title>dat-gui</title>
 
-<script src="build/gui.js"></script>
+<script src="build/dat-gui.js"></script>
 <link rel="stylesheet" href="docs/style.css">
 
 </style>
@@ -21,4 +21,4 @@
 <script src="docs/examples.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/examples/index.html b/examples/index.html
index e8db819..d12db1f 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -4,22 +4,9 @@
 
     <meta charset="utf-8">
     <title>dat-gui kitchen sink</title>
-<<<<<<< HEAD
 
-
-    <script src="../build/gui.js"></script>
-    <!-- <link rel="import" href="../gui.html"> -->
-||||||| merged common ancestors
-    
-    
-    <script src="../build/gui.js"></script>
-    <!-- <link rel="import" href="../gui.html"> -->
-=======
-    
-    
-    <!-- // <script src="../build/gui.js"></script> -->
-    <link rel="import" href="../gui.html">
->>>>>>> 8d86460ebde6d3dda4dec6e7783f0223fca59d00
+    <!--<script src="../build/dat-gui.js"></script>-->
+    <link rel="import" href="../dat-gui.html">
 
     <meta name="viewport" content="width=device-width, user-scalable=no">
 
diff --git a/gulpfile.js b/gulpfile.js
index 66dce90..09b008b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,9 +7,9 @@ var gulp        = require( 'gulp' ),
     $           = require( 'gulp-load-plugins' )();
 
 var paths = {
-    build:  [ 'elements/**/*.styl', 'elements/**/*.html', 'elements/**/*.js' , 'gui.html' ],
+    build:  [ 'elements/**/*.styl', 'elements/**/*.html', 'elements/**/*.js' , 'dat-gui.html' ],
     lint:   [ 'gulpfile.js', 'elements/**/*.js' ],
-    test:   [ 'build/gui.js', 'tests/*.js' ],
+    test:   [ 'build/dat-gui.js', 'tests/*.js' ],
     clean:  [ 'build/*', '**/*.css' ],
     docs:   [ 'README.md', 'docs/*' ],
     shim:   [ 'elements/shim.js' ]
@@ -61,19 +61,19 @@ gulp.task( 'browser', [], function() {
 
 gulp.task( 'build', [ 'vulcanize' ], function() {
 
-    return gulp.src( 'build/gui.html' )
+    return gulp.src( 'build/dat-gui.html' )
        .pipe( $.replace( /\\/g, '\\\\' ) )
        .pipe( $.replace( /'/g, '\\\'' ) )
        .pipe( $.replace( /^(.*)$/gm, '\'$1\',' ) )
        .pipe( $.insert.wrap( 'document.write([', '].join("\\n"))' ) )
-       .pipe( $.rename( 'gui.js' ) )
+       .pipe( $.rename( 'dat-gui.js' ) )
        .pipe( gulp.dest( 'build' ) );
 
 } );
 
 gulp.task( 'vulcanize', [ 'css' ], function() {
 
-    return gulp.src( 'gui.html' )
+    return gulp.src( 'dat-gui.html' )
         .pipe( $.vulcanize( {
             dest: 'build',
             inline: true,
diff --git a/index.html b/index.html
index c742579..d9bc894 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
 
 <title>dat-gui</title>
 
-<script src="build/gui.js"></script>
+<script src="build/dat-gui.js"></script>
 <link rel="stylesheet" href="docs/style.css">
 
 </style>
@@ -25,7 +25,7 @@
 <a href="#saving"> Saving </a></p>
 <h3 id="basic-usage">Basic Usage</h3>
 <p>Download the <a href="todo">minified library</a> and include it in your html.</p>
-<pre><code class="lang-html">&lt;script src=&quot;gui.js&quot;&gt;&lt;/script&gt;
+<pre><code class="lang-html">&lt;script src=&quot;dat-gui.js&quot;&gt;&lt;/script&gt;
 </code></pre>
 <p>Create controllers by adding objects and their properties. dat-gui chooses a controller based on the variable&#39;s initial value.</p>
 <pre><code class="lang-javascript">var gui = new Gui();
@@ -186,7 +186,7 @@ Gui.register( &#39;dat-gui-number&#39;, function( value ) {
 <pre><code class="lang-sh">$ bower install gui-three
 </code></pre>
 <p>Include the source for the third-party controllers after dat-gui.</p>
-<pre><code class="lang-html">&lt;script src=&quot;gui.js&quot;&gt;&lt;/script&gt;
+<pre><code class="lang-html">&lt;script src=&quot;dat-gui.js&quot;&gt;&lt;/script&gt;
 &lt;script src=&quot;gui-three.js&quot;&gt;&lt;/script&gt;
 </code></pre>
 </div>
@@ -195,4 +195,4 @@ Gui.register( &#39;dat-gui-number&#39;, function( value ) {
 <script src="docs/examples.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>