Skip to content

Commit

Permalink
Merge pull request #22 from bboyle/bower
Browse files Browse the repository at this point in the history
Bower
  • Loading branch information
bboyle committed Apr 3, 2014
2 parents 09654a9 + 0c8db9f commit 7e1652e
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Regarding code style like indentation and whitespace, **follow the conventions y
While Grunt can run the included unit tests via [PhantomJS](http://phantomjs.org/), this shouldn't be considered a substitute for the real thing. Please be sure to test the `test/*.html` unit test file(s) in _actual_ browsers.

## Modifying the code
First, ensure that you have the latest [Node.js](http://nodejs.org/) and [npm](http://npmjs.org/) installed.
First, ensure that you have the latest [Node.js](http://nodejs.org/), [npm](http://npmjs.org/) and [bower](http://bower.io/) installed.

Test that Grunt's CLI is installed by running `grunt --version`. If the command isn't found, run `npm install -g grunt-cli`. For more information about installing Grunt, see the [getting started guide](http://gruntjs.com/getting-started).

Expand Down
7 changes: 7 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ module.exports = function( grunt ) {
'http://localhost:8000/test/plugin.html?jquery=1.4.4',
'http://localhost:8000/test/relevantWhen.html?jquery=1.4.4',
'http://localhost:8000/test/ui.html?jquery=1.4.4',
// 1.7.2
'http://localhost:8000/test/events.html?jquery=1.7.2',
'http://localhost:8000/test/instructions.html?jquery=1.7.2',
'http://localhost:8000/test/legacy-API.html?jquery=1.7.2',
'http://localhost:8000/test/plugin.html?jquery=1.7.2',
'http://localhost:8000/test/relevantWhen.html?jquery=1.7.2',
'http://localhost:8000/test/ui.html?jquery=1.7.2',
// 2.1.0
'http://localhost:8000/test/events.html?jquery=2.1.0',
'http://localhost:8000/test/instructions.html?jquery=2.1.0',
Expand Down
11 changes: 4 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "relevance",
"description": "Progressive disclosure (relevance) for HTML elements",
"version": "1.1.2",
"version": "1.1.3",
"homepage": "https://github.com/bboyle/relevance",
"authors": [
"Ben Boyle <benjamins.boyle@gmail.com>"
Expand All @@ -20,20 +20,17 @@
"private": true,
"ignore": [
"**/.*",
"bower.json",
"*.json",
"CONTRIBUTING.md",
"demo.html",
"Gruntfile.js",
"package.json",
"Readme.md",
"src",
"libs",
"node_modules",
"bower_components",
"test",
"tests"
"test"
],
"dependencies": {
"jquery": "1.7.2"
"jquery": "*"
}
}
2 changes: 1 addition & 1 deletion dist/jquery.forces.relevance.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! relevance - v1.1.1 - 2014-04-02
/*! relevance - v1.1.3 - 2014-04-03
* https://github.com/bboyle/relevance
* Copyright (c) 2014 Ben Boyle; Licensed MIT */
if ( jQuery !== 'undefined' ) {
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.forces.relevance.min.js

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

2 changes: 1 addition & 1 deletion dist/jquery.relevance.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! relevance - v1.1.1 - 2014-04-02
/*! relevance - v1.1.3 - 2014-04-03
* https://github.com/bboyle/relevance
* Copyright (c) 2014 Ben Boyle; Licensed MIT */
if ( jQuery !== 'undefined' ) {
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.relevance.min.js

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

2 changes: 1 addition & 1 deletion libs/jquery-loader.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(function() {
// Default to the local version.
var path = '../bower_components/jquery/jquery.js';
var path = '../bower_components/jquery/dist/jquery.js';
// Get any jquery=___ param from the query string.
var jqversion = location.search.match(/[?&]jquery=(.*?)(?=&|$)/);
// If a version was specified, use that version from code.jquery.com.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "relevance",
"title": "relevance",
"description": "Progressive disclosure (relevance) for HTML elements",
"version": "1.1.2",
"version": "1.1.3",
"homepage": "https://github.com/bboyle/relevance",
"author": {
"name": "Ben Boyle",
Expand Down Expand Up @@ -37,7 +37,7 @@
"grunt-contrib-concat": "~0.4.0",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-contrib-jshint": "~0.9.2",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-qunit": "~0.4.0",
"qunitjs": "~1.14.0",
Expand Down

0 comments on commit 7e1652e

Please sign in to comment.