Merge branch 'zjr-master'

README.md

@@ -74,7 +74,6 @@ Because there can be only one modal active at a single time, there's no need to
 
  $.modal.close();
 
-_TODO: this should be changed so that when called on a specific element, the element is returned (normal jQuery fashion)._
 
 Similar to how links can be automatically bound to open modals, they can be bound to close modals using `rel="modal:close"`:
 
@@ -215,4 +214,4 @@ jQuery Modal is distributed under the [MIT License](Learn more at http:https://opensou
  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

jquery.modal.js

@@ -1,6 +1,6 @@
 /*
  A simple jQuery modal (http:https://github.com/kylefox/jquery-modal)
- Version 0.5.2
+ Version 0.5.3
 */
 (function($) {
 
@@ -136,7 +136,9 @@
  if (!current) return;
  if (event) event.preventDefault();
  current.close();
+ var that = current.$elm;
  current = null;
+ return that;
  };
 
  $.modal.resize = function() {
@@ -177,8 +179,8 @@
  };
 
  // Automatically bind links with rel="modal:close" to, well, close the modal.
- $(document).on('click', 'a[rel="modal:close"]', $.modal.close);
- $(document).on('click', 'a[rel="modal:open"]', function(event) {
+ $(document).on('click.modal', 'a[rel="modal:close"]', $.modal.close);
+ $(document).on('click.modal', 'a[rel="modal:open"]', function(event) {
  event.preventDefault();
  $(this).modal();
  });