Merge branch 'master' into gh-pages

Author: i-like-robots

.gitignore

@@ -0,0 +1,14 @@
+node_modules/
+
+.DS_Store
+.idea
+.svn
+
+*.gz
+*.db
+*.log
+*.bak
+*.dat
+*.out
+*.sublime-project
+*.sublime-workspace

Gruntfile.js

@@ -0,0 +1,40 @@
+module.exports = function(grunt) {
+
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('modal.jquery.json'),
+    uglify: {
+      options: {
+        banner: [
+        '/*!',
+        ' * @name        <%= pkg.title %>',
+        ' * @author      <%= pkg.author.name %> <<%= pkg.homepage %>>',
+        ' * @modified    <%= grunt.template.today("dddd, mmmm dS, yyyy, HH:MM:ss") %>',
+        ' * @version     <%= pkg.version %>',
+        ' */'].join('\n')
+      },
+      my_target: {
+        files: {
+          'dist/modal.js': ['<banner>', 'src/modal.js']
+        }
+      }
+    },
+    jshint: {
+      all: ['Gruntfile.js', 'src/*.js'],
+      options: {
+        trailing: true,
+        browser: true,
+        globals: {
+          jQuery: true,
+          define: false,
+          module: true
+        }
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+
+  grunt.registerTask('default', ['jshint', 'uglify']);
+
+};

README.markdown

@@ -21,7 +21,7 @@ https://github.com/i-like-robots/jQuery-Modal/issues
 
 ## Versioning
 
-The current version is `1.0.0`. Releases will be numbered in following format:
+The current version is `1.0.1`. Releases will be numbered in following format:
 
 `<major>.<minor>.<patch>`
 

dist/modal.js

@@ -61,6 +61,22 @@ <h2>Setup</h2>
 </pre>
 			</figure>
 
+			<p>
+				You can also 'namespace' plugin instances so that multiple modals can be attached to the same parent.
+
+			</p>
+
+			<figure>
+<pre class="syntax"><span class="kd">var</span> <span class="nx">$m</span> <span class="o">=</span> <span class="nx">$</span><span class="p">(</span><span class="s1">'body'</span><span class="p">);</span>
+
+<span class="c1">// Attach two modal windows to the same parent</span>
+<span class="nx">$m</span><span class="p">.</span><span class="nx">modal</span><span class="p">(</span><span class="kc">null</span><span class="p">,</span> <span class="s1">'alpha'</span><span class="p">).</span><span class="nx">modal</span><span class="p">(</span><span class="kc">null</span><span class="p">,</span> <span class="s1">'beta'</span><span class="p">);</span>
+
+<span class="kd">var</span> <span class="nx">alpha</span> <span class="o">=</span> <span class="nx">$m</span><span class="p">.</span><span class="nx">data</span><span class="p">(</span><span class="s1">'modal_alpha'</span><span class="p">);</span>
+<span class="kd">var</span> <span class="nx">beta</span> <span class="o">=</span> <span class="nx">$m</span><span class="p">.</span><span class="nx">data</span><span class="p">(</span><span class="s1">'modal_beta'</span><span class="p">);</span>
+</pre>
+			</figure>
+
 			<p>
 				The simplest example is to open a modal window instance with basic HTML content:
 			</p>
@@ -211,8 +227,8 @@ <h2>Public methods</h2>
 		<img style="position:absolute; top:0; right:0; border:0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" />
 	</a>
 
-	<script src="http://code.jquery.com/jquery-1.8.3.min.js"></script>
-	<script src="js/modal.js"></script>
+	<script src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+	<script src="src/modal.js"></script>
 	<script>
 		$(function()
 		{

grunt.js

@@ -1,6 +1,6 @@
 {
-  "name": "jQuery-Modal",
-  "version": "1.0.0",
+  "name": "modal",
+  "version": "1.0.2",
   "title": "jQuery Modal",
   "description": "Every front-end developer needs their own modal window. The plugin is optimised and customisable and even supports multiple, nestable instances.",
   "keywords": [
@@ -21,8 +21,8 @@
     }
   ],
   "bugs": "https://github.com/i-like-robots/jQuery-Modal/issues",
-  "homepage": "http://i-like-robots.github.com/jQuery-Modal/",
-  "demo": "http://i-like-robots.github.com/jQuery-Modal/",
+  "homepage": "http://i-like-robots.github.io/jQuery-Modal/",
+  "demo": "http://i-like-robots.github.io/jQuery-Modal/",
   "dependencies": {
     "jquery": ">=1.7"
   }

index.html

@@ -0,0 +1,31 @@
+{
+  "name": "modal",
+  "version": "1.0.2",
+  "title": "jQuery Modal",
+  "description": "Every front-end developer needs their own modal window. The plugin is optimised and customisable and even supports multiple, nestable instances.",
+  "keywords": [
+    "modal",
+    "lightbox",
+    "lightweight",
+    "flexible"
+  ],
+  "author": {
+    "name": "Matt Hinchliffe",
+    "email": "matt+jquery@maketea.co.uk",
+    "url": "http://maketea.co.uk"
+  },
+  "licenses": [
+    {
+      "type": "CC BY-SA 3.0",
+      "url": "http://creativecommons.org/licenses/by-sa/3.0/"
+    }
+  ],
+  "bugs": "https://github.com/i-like-robots/jQuery-Modal/issues",
+  "homepage": "http://i-like-robots.github.io/jQuery-Modal/",
+  "demo": "http://i-like-robots.github.io/jQuery-Modal/",
+  "devDependencies": {
+    "grunt": "0.4.x",
+    "grunt-contrib-jshint": "0.1.x",
+    "grunt-contrib-uglify": "0.2.x"
+  }
+}

js/modal.min.js

@@ -1,9 +1,3 @@
-/*!
- * @name        jQuery Modal
- * @author      Matt Hinchliffe <https://github.com/i-like-robots/jQuery-Modal>
- * @modified    2012-12-10
- * @version     1.0.0
- */
 (function( $, undefined ) {
 
     'use strict';
@@ -218,12 +212,23 @@
     };
 
     // jQuery plugin wrapper
-    $.fn.modal = function( options ) {
+    $.fn.modal = function( options, namespace ) {
         return this.each(function() {
-            if ( ! $.data(this, 'modal') ) {
-                $.data(this, 'modal', new Modal(this, options) );
+            var name = namespace ? 'modal_' + namespace : 'modal';
+            if ( ! $.data(this, name) ) {
+                $.data(this, name, new Modal(this, options) );
             }
         });
     };
 
+    // AMD and CommonJS module compatibility
+    if ( typeof define === 'function' && define.amd ){
+        define(function() {
+            return Modal;
+        });
+    }
+    else if ( typeof module !== 'undefined' && module.exports ) {
+        module.exports = Modal;
+    }
+
 })(jQuery);

jQuery-Modal.jquery.json renamed to modal.jquery.json

@@ -31,8 +31,8 @@
 		<div id="qunit"></div>
 	</section>
 
-	<script src="http://code.jquery.com/jquery-1.8.3.min.js"></script>
-	<script src="../js/modal.js"></script>
+	<script src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+	<script src="../src/modal.js"></script>
 	<script src="qunit-1.10.0.js"></script>
 
 	<script>
@@ -45,7 +45,7 @@
 
 			var lifecycle = {
 				setup: function() {
-					if ( ! api ) {
+					if ( ! api) {
 						$b = $('body').modal();
 						api = $b.data('modal');
 					}
@@ -64,6 +64,23 @@
 				equal(api.isInitialized, false, "Check isInitialized is defined");
 			});
 
+			test("$(collection).modal(null, namespace)", function() {
+
+				// Create a new instance
+				var $m = $(document.body).modal(null, 'namespace');
+				var api_namespaced = $('body').data('modal_namespace');
+
+				// Original
+				equal(api.target, document.body, "Check modal target defined");
+				equal(api.isOpen, false, "Check isOpen is defined");
+				equal(api.isInitialized, false, "Check isInitialized is defined");
+
+				// Namespaced
+				equal(api_namespaced.target, document.body, "Check namespaced modal target defined");
+				equal(api_namespaced.isOpen, false, "Check namespaced isOpen is defined");
+				equal(api_namespaced.isInitialized, false, "Check namespaced isInitialized is defined");
+			});
+
 			//
 			// API tests
 			//