Merge pull request #53 from lesjames/develop

v4.5.0
lesjames · Jun 4, 2013 · add16fe · add16fe
2 parents 8b58586 + c96afec
commit add16fe
Show file tree

Hide file tree

Showing 12 changed files with 542 additions and 516 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 4.5.0
+
+* Rewrite for more testable code
+* EventEmitter is now a required dependency
+* Removed delay option
+* Can be applied without a selector with `$.fn.breakpoint();`
+
 # 4.4.0
 
 * Made imagesloaded a seperate dependency

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -40,7 +40,8 @@ module.exports = function (grunt) {
                 browser: true,
                 globals: {
                     define: true,
-                    imagesLoaded: true
+                    imagesLoaded: true,
+                    EventEmitter: true
                 }
             },
             files: {
@@ -58,29 +59,41 @@ module.exports = function (grunt) {
                 dest: './test/css/style.css'
             }
         },
-        uglify: {
-            './test/js/vendor/jquery.breakpoint.js': './jquery.breakpoint.js'
+        copy: {
+            main: {
+                files: [
+                    { src: ['jquery.breakpoint.js'], dest: 'test/js/vendor/jquery.breakpoint.js' }
+                ]
+            }
         },
         qunit: {
-            options: {
-                urls: [ 'http://localhost:8000/index.html' ]
+            functions: {
+                options: {
+                    urls: [ 'http://localhost:8000/functions.html' ],
+                    page : {
+                        viewportSize : { width: 300, height: 400 }
+                    }
+                }
             },
-            small: {
+            resizeSmall: {
                 options: {
+                    urls: [ 'http://localhost:8000/resize.html' ],
                     page : {
                         viewportSize : { width: 300, height: 400 }
                     }
                 }
             },
-            medium: {
+            resizeMedium: {
                 options: {
+                    urls: [ 'http://localhost:8000/resize.html' ],
                     page : {
                         viewportSize : { width: 700, height: 400 }
                     }
                 }
             },
-            large: {
+            resizeLarge: {
                 options: {
+                    urls: [ 'http://localhost:8000/resize.html' ],
                     page : {
                         viewportSize : { width: 1000, height: 400 }
                     }
@@ -92,11 +105,9 @@ module.exports = function (grunt) {
     // for dev we need to lint js and compile sass
     grunt.registerTask('default', [
         'jshint',
-        'uglify',
+        'copy',
         'sass:test',
         'connect',
-        'qunit:small',
-        'qunit:medium',
-        'qunit:large'
+        'qunit'
     ]);
 };
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "breakpoint",
-    "version": "4.4.0",
+    "version": "4.5.0",
     "description": "Breakpoint is a column based media query generator and responsive image framework.",
     "author": "Les James",
     "homepage": "https://github.com/lesjames/breakpoint",
@@ -18,7 +18,8 @@
     ],
     "dependencies": {
         "jquery": ">=1.7",
-        "imagesloaded": "~3.0.1"
+        "imagesloaded": "~3.0.1",
+        "eventEmitter": "~4.1.0"
     },
     "devDependencies": {
         "qunit": "1.11.0"