Skip to content
Browse files

Merge branch 'dont-version-built' of github.com:domenic/director into…

… domenic-dont-version-built

Conflicts:
	package.json
	test/browser/browserify-harness.html
	test/browser/html5-routes-harness.html
	test/browser/routes-harness.html
  • Loading branch information...
2 parents 09602f3 + 2ffc3d5 commit fcb155067e21990ab5034b5a12d2bd19573a6223 @jfhbrook jfhbrook committed
View
6 README.md
@@ -39,7 +39,7 @@ Here is a simple example:
<head>
<meta charset="utf-8">
<title>A Gentle Introduction</title>
- <script src="https://raw.github.com/flatiron/director/master/build/director-1.0.7.min.js"></script>
+ <script src="https://raw.github.com/flatiron/director/master/build/director.min.js"></script>
<script>
var author = function () { console.log("author"); },
@@ -76,7 +76,7 @@ Director works great with your favorite DOM library, such as jQuery.
<meta charset="utf-8">
<title>A Gentle Introduction 2</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
- <script src="https://raw.github.com/flatiron/director/master/build/director-1.0.7.min.js"></script>
+ <script src="https://raw.github.com/flatiron/director/master/build/director.min.js"></script>
<script>
$('document').ready(function(){
//
@@ -817,6 +817,6 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[0]: http://github.com/flatiron/director
-[1]: https://github.com/flatiron/director/blob/master/build/director-1.0.7.min.js
+[1]: https://github.com/flatiron/director/blob/master/build/director.min.js
[2]: http://github.com/flatiron/flatiron
[3]: http://github.com/flatiron/union
View
3 bin/build
@@ -15,7 +15,8 @@ surgeon
//
.configure({
package: root + '/package.json',
- owner: 'Nodejitsu, Inc (Using Codesurgeon).'
+ owner: 'Nodejitsu, Inc (Using Codesurgeon).',
+ noVersion: true
})
.read(
path.join(lib, 'browser.js')
View
2 package.json
@@ -30,7 +30,7 @@
"vows": "0.6.x"
},
"ender": "./build/ender.js",
- "browserify": "./build/director-1.1.6",
+ "browserify": "./build/director",
"main": "./lib/director",
"engines": {
"node": ">= 0.4.0"
View
2 test/browser/browserify-harness.html
@@ -14,7 +14,7 @@
<script src="browserified-bundle.js"></script>
<script>
var HTML5TEST = false;
- var RouterAlias = require('/director-1.1.6').Router;
+ var RouterAlias = require('/director').Router;
</script>
<script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
View
2 test/browser/html5-routes-harness.html
@@ -16,7 +16,7 @@
</script>
<script src="/files/node_modules/qunitjs/qunit/qunit.js"></script>
- <script src="/files/build/director-1.1.6.js"></script>
+ <script src="/files/build/director.js"></script>
<script src="/files/helpers/api.js"></script>
<script src="/files/html5-routes-test.js"></script>
</body>
View
2 test/browser/routes-harness.html
@@ -14,7 +14,7 @@
</script>
<script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
- <script src="../../build/director-1.1.6.js"></script>
+ <script src="../../build/director.js"></script>
<script src="helpers/api.js"></script>
<script src="routes-test.js"></script>
</body>

0 comments on commit fcb1550

Please sign in to comment.
Something went wrong with that request. Please try again.