Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'micmro-master'
  • Loading branch information
tuupola committed Mar 26, 2016
2 parents 5f81c8e + 2888727 commit 755c41d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 0 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.textile
Expand Up @@ -29,6 +29,19 @@ h4. Install with "bower":http://bower.io

<pre>$ bower install jquery.lazyload</pre>

h4. Run local "Grunt":http://gruntjs.com test to see examples

Install dependencies:
install "node.js":http://nodejs.org/
Install Grunt and dependencies (in jquery_lazyload directory)
<pre>
$ npm install -g grunt-cli
$ npm install
</pre>

Start server:
<pre>$ grunt server</pre>

h1. License

All code licensed under the "MIT License":http://www.opensource.org/licenses/mit-license.php. All images licensed under "Creative Commons Attribution 3.0 Unported License":http://creativecommons.org/licenses/by/3.0/deed.en_US. In other words you are basically free to do whatever you want. Just don't remove my name from the source.
Expand Down
11 changes: 11 additions & 0 deletions Gruntfile.js
Expand Up @@ -31,16 +31,27 @@ module.exports = function(grunt) {
specs: "test/spec/*Spec.js",
vendor: ["test/vendor/jquery-1.9.0.js", "test/vendor/jasmine-jquery.js"]
}
},
connect: {
all: {
options:{
port: 8080,
hostname: "localhost",
keepalive : true
}
}
}
});

grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-contrib-jshint");
grunt.loadNpmTasks("grunt-contrib-jasmine");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks('grunt-contrib-connect');

//grunt.registerTask("test", ["jshint", "jasmine"]);
grunt.registerTask("test", ["jshint"]);
grunt.registerTask("default", ["test", "uglify"]);
grunt.registerTask("server", ["connect"]);

};
3 changes: 3 additions & 0 deletions package.json
Expand Up @@ -19,6 +19,9 @@
"grunt-contrib-jasmine": "~0.5.2",
"grunt-contrib-watch": "~0.5.3"
},
"dependencies": {
"grunt-contrib-connect": "^0.8.0"
},
"description": "Lazyload images with jQuery",
"bugs": {
"url": "https://github.com/tuupola/jquery_lazyload/issues"
Expand Down

0 comments on commit 755c41d

Please sign in to comment.