Merge pull request #1230 from nschonni/reorg-file-tree

Move JS files under src directory

Gruntfile.js

@@ -16,7 +16,7 @@ module.exports = function(grunt) {
             dist: {
                 expand: true,
                 flatten: true,
-                src: ["jquery.*.js", "!jquery.js"],
+                src: ["src/**/*.js"],
                 dest: "dist/",
                 rename: function(base, path) {
                     return base + path.replace(/\.js/, ".min.js");
@@ -29,7 +29,7 @@ module.exports = function(grunt) {
                 src: "Gruntfile.js"
             },
             flot: {
-                src: ["jquery.flot*.js"]
+                src: ["src/**/*.js"]
             }
         },
         watch: {

examples/ajax/index.html

@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/annotating/index.html

@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/axes-interacting/index.html

@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/axes-multiple/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.time.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/axes-time-zones/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.time.js"></script>
 	<script language="javascript" type="text/javascript" src="date.js"></script>
 	<script type="text/javascript">
 

examples/axes-time/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.time.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/basic-options/index.html

@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function () {

examples/basic-usage/index.html

@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/canvas/index.html

@@ -7,9 +7,9 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.canvas.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.time.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.canvas.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/categories/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.categories.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.categories.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/image/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.image.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.image.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/index.html

@@ -13,7 +13,7 @@
 
 	</style>
 	<script language="javascript" type="text/javascript" src="../lib/jquery.js"></script>
-	<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/interacting/index.html

@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/markings/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
     <script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
     <script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-    <script language="javascript" type="text/javascript" src="../../jquery.flot.image.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+    <script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.image.js"></script>
 	<script type="text/javascript">
 
 	    $(function () {

examples/navigate/index.html

@@ -26,8 +26,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.navigate.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.navigate.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/percentiles/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>	
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.fillbetween.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.fillbetween.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/realtime/index.html

@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>	
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/resize/index.html

@@ -9,8 +9,8 @@
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
 	<script language="javascript" type="text/javascript" src="../shared/jquery-ui/jquery-ui.min.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.resize.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.resize.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/selection/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.selection.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.selection.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/series-errorbars/index.html

@@ -7,9 +7,9 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.errorbars.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.navigate.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.errorbars.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.navigate.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/series-pie/index.html

@@ -78,8 +78,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.pie.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.pie.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/series-toggle/index.html

@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/series-types/index.html

@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/stacking/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.stack.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.stack.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/symbols/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.symbol.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.symbol.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/threshold/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.threshold.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.threshold.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/tracking/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.crosshair.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.crosshair.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/visitors/index.html

@@ -7,9 +7,9 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.selection.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.time.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.selection.js"></script>
 	<script type="text/javascript">
 
 	$(function() {

examples/zooming/index.html

@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.selection.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.selection.js"></script>
 	<script type="text/javascript">
 
 	$(function() {