Skip to content

Commit

Permalink
Merge branch 'gh-pages'
Browse files Browse the repository at this point in the history
  • Loading branch information
rodneyrehm committed Jan 22, 2014
2 parents 4819487 + 40a8913 commit 4130a00
Show file tree
Hide file tree
Showing 11 changed files with 92 additions and 81 deletions.
2 changes: 1 addition & 1 deletion URI.jquery.json
Expand Up @@ -18,7 +18,7 @@
"URI-manipulation",
"URL-manipulation"
],
"version": "[dev-version]",
"version": "1.11.2",
"author": {
"name": "Rodney Rehm",
"url": "http://rodneyrehm.de/en/"
Expand Down
15 changes: 13 additions & 2 deletions component.json → bower.json
@@ -1,6 +1,6 @@
{
"name": "URIjs",
"version": "[dev-version]",
"version": "1.11.2",
"main": [
"src/URI.js",
"src/IPv6.js",
Expand All @@ -9,7 +9,18 @@
"src/URITemplate.js",
"src/jquery.URI.js"
],
"ignore": [
".*",
"*.css",
"*.min.js",
"/*.js",
"/*.html",
"/*.json",
"utils",
"test",
"prettify"
],
"dependencies": {
"jquery": ">=1.7.0"
}
}
}
2 changes: 1 addition & 1 deletion build.js
Expand Up @@ -29,7 +29,7 @@ function build(files) {
output_format: "text",
output_info: "compiled_code"
}, function(data) {
var code = "/*! URI.js v[dev-version] http://medialize.github.com/URI.js/ */\n/* build contains: " + files.join(', ') + " */\n" + data;
var code = "/*! URI.js v1.11.2 http://medialize.github.com/URI.js/ */\n/* build contains: " + files.join(', ') + " */\n" + data;
$progress.hide();
$out.val(code).parent().show();
$out.prev().find('a').remove();
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "URIjs",
"version": "[dev-version]",
"version": "1.11.2",
"title": "URI.js - Mutating URLs",
"author": {
"name": "Rodney Rehm",
Expand Down
2 changes: 1 addition & 1 deletion src/IPv6.js
Expand Up @@ -2,7 +2,7 @@
* URI.js - Mutating URLs
* IPv6 Support
*
* Version: [dev-version]
* Version: 1.11.2
*
* Author: Rodney Rehm
* Web: http://medialize.github.com/URI.js/
Expand Down
2 changes: 1 addition & 1 deletion src/SecondLevelDomains.js
Expand Up @@ -2,7 +2,7 @@
* URI.js - Mutating URLs
* Second Level Domain (SLD) Support
*
* Version: [dev-version]
* Version: 1.11.2
*
* Author: Rodney Rehm
* Web: http://medialize.github.com/URI.js/
Expand Down
2 changes: 1 addition & 1 deletion src/URI.js
@@ -1,7 +1,7 @@
/*!
* URI.js - Mutating URLs
*
* Version: [dev-version]
* Version: 1.11.2
*
* Author: Rodney Rehm
* Web: http://medialize.github.com/URI.js/
Expand Down
140 changes: 70 additions & 70 deletions src/URI.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/URITemplate.js
Expand Up @@ -2,7 +2,7 @@
* URI.js - Mutating URLs
* URI Template Support - http://tools.ietf.org/html/rfc6570
*
* Version: [dev-version]
* Version: 1.11.2
*
* Author: Rodney Rehm
* Web: http://medialize.github.com/URI.js/
Expand Down
2 changes: 1 addition & 1 deletion src/jquery.URI.js
Expand Up @@ -2,7 +2,7 @@
* URI.js - Mutating URLs
* jQuery Plugin
*
* Version: [dev-version]
* Version: 1.11.2
*
* Author: Rodney Rehm
* Web: http://medialize.github.com/URI.js/jquery-uri-plugin.html
Expand Down
2 changes: 1 addition & 1 deletion src/jquery.URI.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4130a00

Please sign in to comment.