Merge branch 'RinkAttendant6-umd' into development

rdebeasi · rdebeasi · commit a859b7f15057 · 2015-07-09T20:37:24.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 
 .DS_Store
+bower_components/
diff --git a/README.md b/README.md
@@ -5,20 +5,30 @@ flexMenu is a jQuery plugin that lets you create responsive menus that automatic
 
 [Source on GitHub](https://github.com/352Media/flexMenu)
 
-Author: [Ryan DeBeasi](http://www.ryandebeasi.com/)
-
-Contributors: [Pete Bernardo](https://github.com/peterbernardo), [Dennis S. Hennen](https://github.com/dsh), and [Blake McLeod](https://github.com/bmcleod)
+Written by [Ryan DeBeasi](http://www.ryandebeasi.com/) and [our fantastic contributors](https://github.com/352Media/flexMenu/graphs/contributors).
 
 ##Usage
 
+First, download flexmenu.js from GitHub or install it with `bower install flexmenu`. Then, add a script tag that references flexMenu. For example: `<script src="flexmenu.js"></script>`.
+
 Create an unordered list that contains your menu items. In CSS, use `display: inline-block;` or `float: left;` to get the  `li` elements to line up horizontally.
 
-Call flexMenu on an unordered list that contains your menu items.
+Finally, call flexMenu on an unordered list that contains your menu items:
 
 ```javascript
 $('ul.menu.flex').flexMenu();
 ```
 
+###AMD/RequireJS
+
+The plugin can be loaded using an AMD loader such as RequireJS:
+
+```javascript
+require(['jquery', 'flexmenu'], function ($) {
+    $('ul.menu.flex').flexMenu();
+});
+```
+
 ##Dependencies
 
 ###jQuery
@@ -75,7 +85,7 @@ Should we absolutely position the popup? Usually this is a good idea. That way,
 
 flexMenu is licensesed under the MIT License, and is free for commercial or personal use.
 
-Copyright &copy; 2012 352 Media Group
+Copyright &copy; 2012-2014 352 Inc. & Contributors
 
 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 without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/bower.json b/bower.json
@@ -0,0 +1,26 @@
+{
+  "name": "flexMenu",
+  "version": "1.1.1",
+  "homepage": "https://github.com/352Media/flexMenu",
+  "authors": [
+    "Ryan DeBeasi <hi@ryandebeasi.com>"
+  ],
+  "description": "FlexMenu lets you create menu bars that automatically collapse into a drop-down to fit the space available.",
+  "main": "flexmenu.js",
+  "keywords": [
+    "menu",
+    "responsive",
+    "design"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": ">1.7.0"
+  }
+}
diff --git a/demo-subnav.html b/demo-subnav.html
@@ -10,7 +10,7 @@
 	<meta name="viewport" content="width=device-width">
 	<link rel="stylesheet" href="demo.css">
 	<style>
-		/* Sub-menu styles 
+		/* Sub-menu styles
 		** Not included here: CSS for when the sub-menu appears in .menu-flex. */
 		.menu-sub {
 			display: none;
@@ -24,15 +24,15 @@
 		}
 	</style>
 	<script src="modernizr.custom.js"></script>
-	<link href='http://fonts.googleapis.com/css?family=Quantico:700' rel='stylesheet' type='text/css'>
+	<link href='https://fonts.googleapis.com/css?family=Quantico:700' rel='stylesheet' type='text/css'>
 </head>
 <body>
 
 		<div class="header">
 		<h1>flexMenu</h1>
 		<p>flexMenu is a jQuery plugin that lets you create responsive menu bars. When there's only space to display some of the items in the menu, the rest of the items collapse into a "more" drop-down. When there's only space to display one or two items, all the items collapse into a "menu" drop-down. Try it out - just resize the page, or view it on a smartphone!</p>
 	</div>
-	
+
 	<div role="main" class="main">
 
 		<ul class="menu flex">
@@ -111,16 +111,16 @@ <h2>Multiple Menus</h2>
 		</p>
 	</div>
 
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 
 	<script src="flexmenu.min.js"></script>
 
-	<script type="text/javascript">
+	<script>
 		$('ul.menu.flex').flexMenu();
 		$('ul.menu.flex-multi').flexMenu({
 			showOnHover: false
 		})
 	</script>
 
 </body>
-</html>
+</html>
diff --git a/demo.html b/demo.html
@@ -11,15 +11,15 @@
 	<link rel="stylesheet" href="demo.css">
 
 	<script src="modernizr.custom.js"></script>
-	<link href='http://fonts.googleapis.com/css?family=Quantico:700' rel='stylesheet' type='text/css'>
+	<link href='https://fonts.googleapis.com/css?family=Quantico:700' rel='stylesheet' type='text/css'>
 </head>
 <body>
 
 	<div class="header">
 		<h1>flexMenu</h1>
 		<p>flexMenu is a jQuery plugin that lets you create responsive menu bars. When there's only space to display some of the items in the menu, the rest of the items collapse into a "more" drop-down. When there's only space to display one or two items, all the items collapse into a "menu" drop-down. Try it out - just resize the page, or view it on a smartphone!</p>
 	</div>
-	
+
 	<div role="main" class="main">
 
 		<ul class="menu flex">
@@ -89,16 +89,16 @@ <h2>Multiple Menus</h2>
 		</p>
 	</div>
 
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
 
 	<script src="flexmenu.min.js"></script>
 
-	<script type="text/javascript">
+	<script>
 		$('ul.menu.flex').flexMenu();
 		$('ul.menu.flex-multi').flexMenu({
 			showOnHover: false
 		})
 	</script>
 
 </body>
-</html>
+</html>
diff --git a/flexmenu.js b/flexmenu.js
@@ -3,7 +3,15 @@
 	Description: If a list is too long for all items to fit on one line, display a popup menu instead.
 	Dependencies: jQuery, Modernizr (optional). Without Modernizr, the menu can only be shown on click (not hover). */
 
-(function ($) {
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD. Register as an anonymous module.
+		define(['jquery'], factory);
+	} else {
+		// Browser globals
+		factory(jQuery);
+	}
+}(function ($) {
 	var flexObjects = [], // Array of all flexMenu objects
 		resizeTimeout;
 	// When the page is resized, adjust the flexMenus.
@@ -134,4 +142,4 @@
 			}
 		});
 	};
-})(jQuery);
+}));

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`
`2`	`2`	`.DS_Store`
	`3`	`+bower_components/`