Prepping for the 2.0.0 release...

registerguard · Oct 24, 2012 · b74e97b · b74e97b
1 parent f1c9802
commit b74e97b
Show file tree

Hide file tree

Showing 6 changed files with 205 additions and 94 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,44 @@
 
 ---
 
+## v1.1.0
+#### Mmmmm [D]D, YYYY
+
+* Merged @patocallaghan's fork:
+	* Modified the callback firing functionality to work with mediaquery context `unmatch`.
+	* Refactored code to pass linting.
+	* Introducted getContext() and getPreviousContext() convenience methods to retrieve mediaquery state.
+	* Added ability to fire callbacks when a mediaquery unmatches.
+* Added Pat to `CONTRIBUTORS.md`.
+* New version number: `v2.0.0`.
+* Fixed typo in `MIT-LICENSE`.
+* Removed `TODO.md` (moved to the project's issue center).
+* Updated demo files to reflect the new changes.
+
+##### Browser tests:
+
+* MAC Snow Leopard:
+	* Firefox `15.0.1`, Safari `6.0.1 (8536.26.14)`, Opera `12.02 (1578)`, Chrome `22.0.1229.79`
+* PC Vista:
+	* Firefox `15.0.1`, Chrome `22.0.1229.79 m`, Safari `5.1.7 (7534.57.2)`, Opera `12.02 (1578)`
+	* IE `9.0.8112.16421`, IE `8.0.6001.18702`, IE `7.0.6002.18005`
+* PC XP:
+    * IE `6.0.2900.5512.xpsp_sp3_gdr.120504-1619`
+* iPhone (Retina 4-inch):
+	* Safari (simulated)
+* iPhone (Retina 3.5-inch), iOS `6.0`:
+	* Safari (simulated), Safari, Chrome `21.0.1180.82`, Opera Mini `7.0.4.44138`
+* iPhone, iOS `6.0`:
+	* Safari (simulated)
+* iPad (Retina), iOS `6.0`:
+	* Safari
+* iPad, iOS `6.0`:
+	* Safari (simulated)
+* iPad, iOS `5.1.1`:
+	* Safari
+
+---
+
 ## v1.0.0
 #### October 6, 2012
 

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -5,3 +5,4 @@ These people have contributed to onMediaQuery:
 * Rory Fitzpatrick ([@roryf](https://github.com/roryf))
 * Peter Dekkers ([@editkid](https://github.com/editkid))
 * Micky Hulse ([@mhulse](https://github.com/mhulse))
+* Pat O'Callaghan ([@patocallaghan](https://github.com/patocallaghan))
diff --git a/MIT-LICENSE b/MIT-LICENSE
@@ -1,10 +1,5 @@
 Copyright (c) 2012 Springload
 
-This software consists of voluntary contributions made by many
-individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
-contribution history, see the revision history and logs, available
-at http://jquery-ui.googlecode.com/svn/
-
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including

diff --git a/TODO.md b/TODO.md
diff --git a/demo/index.html b/demo/index.html
@@ -58,33 +58,53 @@ <h2 class="delta">Delta</h2>
 
 				{
 					context  : 'alpha',
-					callback : function() {
+					match : function() {
+
+						msg('MATCH: alpha, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
 
-						msg('CALLBACK: alpha, CURRENT CONTEXT: ' + oMQ.context + ', LAST CONTEXT: ' + oMQ.last_context);
+					},
+					unmatch: function () {
+
+						msg('UNMATCH: alpha, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
 
 					}
 				},
 				{
 					context  : 'bravo',
-					callback : function() {
+					match : function() {
 
-						msg('CALLBACK: bravo, CURRENT CONTEXT: ' + oMQ.context + ', LAST CONTEXT: ' + oMQ.last_context);
+						msg('MATCH: bravo, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
+
+					},
+					unmatch: function () {
+
+						msg('UNMATCH: bravo, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
 
 					}
 				},
 				{
 					context  : 'charlie',
-					callback : function() {
+					match : function() {
+
+						msg('MATCH: charlie, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
 
-						msg('CALLBACK: charlie, CURRENT CONTEXT: ' + oMQ.context + ', LAST CONTEXT: ' + oMQ.last_context);
+					},
+					unmatch: function () {
+
+						msg('UNMATCH: charlie, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
 
 					}
 				},
 				{
 					context  : 'delta',
 					callback : function() {
 
-						msg('CALLBACK: delta, CURRENT CONTEXT: ' + oMQ.context + ', LAST CONTEXT: ' + oMQ.last_context);
+						msg('MATCH: delta, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
+
+					},
+					unmatch: function () {
+
+						msg('UNMATCH: delta, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
 
 					}
 				}
@@ -99,19 +119,29 @@ <h2 class="delta">Delta</h2>
 
 				var my_query = oMQ.addQuery({
 					context: 'large', 
-					callback: function() {
+					match: function() {
+
+						msg('MATCH: large, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
 
-						msg('CALLBACK: large, CURRENT CONTEXT: ' + oMQ.context + ', LAST CONTEXT: ' + oMQ.last_context);
+					},
+					unmatch: function () {
+
+						msg('UNMATCH: large, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
 
 					}
 				});
 
 				var my_other_query = oMQ.addQuery({
 					context: ['charlie', 'large', 'delta'],
 					call_for_each_context: false,
-					callback: function() {
+					match: function() {
+
+						msg('MATCH: charlie/large/delta, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
+
+					},
+					unmatch: function () {
 
-						msg('CALLBACK: charlie/large/delta, CURRENT CONTEXT: ' + oMQ.context + ', LAST CONTEXT: ' + oMQ.last_context);
+						msg('UNMATCH: charlie/large/delta, CURRENT CONTEXT: ' + oMQ.getCurrentContext() + ', LAST CONTEXT: ' + oMQ.getLastContext());
 
 					}
 				});