Permalink
Browse files

Merge branch 'master' of github.com:vvo/lazyload

Conflicts:
	package.json
  • Loading branch information...
2 parents 4ae00ed + d7b126d commit 3d3c227bb5cd54a30e60d5e88da16fef7234acc6 @vvo committed Jun 23, 2013
Showing with 7 additions and 8 deletions.
  1. +0 −1 README.md
  2. +7 −7 package.json
View
@@ -2,7 +2,6 @@
Lazyload images, iframes, divs, widgets untill they are visible in the viewport.
-Pretty stable but still in alpha.
Battle tested against IE8+ Android Ch FF.
[![browser support](https://ci.testling.com/vvo/lazyload.png)](https://ci.testling.com/vvo/lazyload)
View
@@ -1,12 +1,17 @@
{
"name": "lazyload",
- "description": "Image lazy loading",
"version": "2.0.4",
+ "description": "Image lazy loading",
+ "main": "build/lazyload.min.js",
+ "scripts": {
+ "test": "mocha-phantomjs test/test.html"
+ },
"repository": {
"type": "git",
"url": "http://github.com/vvo/lazyload.git"
},
- "main": "build/lazyload.min.js",
+ "author": "Vincent Voyer <vincent.voyer@gmail.com> (http://github.com/vvo)",
+ "license": "MIT",
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-concat": "~0.3.0",
@@ -15,11 +20,6 @@
"grunt-contrib-jshint": "~0.4.3",
"mocha": "~1.9.0"
},
- "scripts": {
- "test": "mocha-phantomjs test/test.html"
- },
- "author": "Vincent Voyer <vincent.voyer@gmail.com> (http://github.com/vvo)",
- "license": "MIT",
"testling": {
"scripts": [
"build/lazyload.min.js",

0 comments on commit 3d3c227

Please sign in to comment.