From 9242e2acca788934ab84925e87fc9bc84784628a Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 25 Jan 2014 13:12:50 -0500 Subject: [PATCH 1/2] Move JS files under src directory --- Gruntfile.js | 4 ++-- jquery.flot.js => src/jquery.flot.js | 0 jquery.flot.canvas.js => src/plugins/jquery.flot.canvas.js | 0 .../plugins/jquery.flot.categories.js | 0 .../plugins/jquery.flot.crosshair.js | 0 .../plugins/jquery.flot.errorbars.js | 0 .../plugins/jquery.flot.fillbetween.js | 0 jquery.flot.image.js => src/plugins/jquery.flot.image.js | 0 .../plugins/jquery.flot.navigate.js | 0 jquery.flot.pie.js => src/plugins/jquery.flot.pie.js | 0 jquery.flot.resize.js => src/plugins/jquery.flot.resize.js | 0 .../plugins/jquery.flot.selection.js | 0 jquery.flot.stack.js => src/plugins/jquery.flot.stack.js | 0 jquery.flot.symbol.js => src/plugins/jquery.flot.symbol.js | 0 .../plugins/jquery.flot.threshold.js | 0 jquery.flot.time.js => src/plugins/jquery.flot.time.js | 0 16 files changed, 2 insertions(+), 2 deletions(-) rename jquery.flot.js => src/jquery.flot.js (100%) rename jquery.flot.canvas.js => src/plugins/jquery.flot.canvas.js (100%) rename jquery.flot.categories.js => src/plugins/jquery.flot.categories.js (100%) rename jquery.flot.crosshair.js => src/plugins/jquery.flot.crosshair.js (100%) rename jquery.flot.errorbars.js => src/plugins/jquery.flot.errorbars.js (100%) rename jquery.flot.fillbetween.js => src/plugins/jquery.flot.fillbetween.js (100%) rename jquery.flot.image.js => src/plugins/jquery.flot.image.js (100%) rename jquery.flot.navigate.js => src/plugins/jquery.flot.navigate.js (100%) rename jquery.flot.pie.js => src/plugins/jquery.flot.pie.js (100%) rename jquery.flot.resize.js => src/plugins/jquery.flot.resize.js (100%) rename jquery.flot.selection.js => src/plugins/jquery.flot.selection.js (100%) rename jquery.flot.stack.js => src/plugins/jquery.flot.stack.js (100%) rename jquery.flot.symbol.js => src/plugins/jquery.flot.symbol.js (100%) rename jquery.flot.threshold.js => src/plugins/jquery.flot.threshold.js (100%) rename jquery.flot.time.js => src/plugins/jquery.flot.time.js (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 0654d4f..ade7288 100644 --- a/Gruntfile.js +++ b/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: { diff --git a/jquery.flot.js b/src/jquery.flot.js similarity index 100% rename from jquery.flot.js rename to src/jquery.flot.js diff --git a/jquery.flot.canvas.js b/src/plugins/jquery.flot.canvas.js similarity index 100% rename from jquery.flot.canvas.js rename to src/plugins/jquery.flot.canvas.js diff --git a/jquery.flot.categories.js b/src/plugins/jquery.flot.categories.js similarity index 100% rename from jquery.flot.categories.js rename to src/plugins/jquery.flot.categories.js diff --git a/jquery.flot.crosshair.js b/src/plugins/jquery.flot.crosshair.js similarity index 100% rename from jquery.flot.crosshair.js rename to src/plugins/jquery.flot.crosshair.js diff --git a/jquery.flot.errorbars.js b/src/plugins/jquery.flot.errorbars.js similarity index 100% rename from jquery.flot.errorbars.js rename to src/plugins/jquery.flot.errorbars.js diff --git a/jquery.flot.fillbetween.js b/src/plugins/jquery.flot.fillbetween.js similarity index 100% rename from jquery.flot.fillbetween.js rename to src/plugins/jquery.flot.fillbetween.js diff --git a/jquery.flot.image.js b/src/plugins/jquery.flot.image.js similarity index 100% rename from jquery.flot.image.js rename to src/plugins/jquery.flot.image.js diff --git a/jquery.flot.navigate.js b/src/plugins/jquery.flot.navigate.js similarity index 100% rename from jquery.flot.navigate.js rename to src/plugins/jquery.flot.navigate.js diff --git a/jquery.flot.pie.js b/src/plugins/jquery.flot.pie.js similarity index 100% rename from jquery.flot.pie.js rename to src/plugins/jquery.flot.pie.js diff --git a/jquery.flot.resize.js b/src/plugins/jquery.flot.resize.js similarity index 100% rename from jquery.flot.resize.js rename to src/plugins/jquery.flot.resize.js diff --git a/jquery.flot.selection.js b/src/plugins/jquery.flot.selection.js similarity index 100% rename from jquery.flot.selection.js rename to src/plugins/jquery.flot.selection.js diff --git a/jquery.flot.stack.js b/src/plugins/jquery.flot.stack.js similarity index 100% rename from jquery.flot.stack.js rename to src/plugins/jquery.flot.stack.js diff --git a/jquery.flot.symbol.js b/src/plugins/jquery.flot.symbol.js similarity index 100% rename from jquery.flot.symbol.js rename to src/plugins/jquery.flot.symbol.js diff --git a/jquery.flot.threshold.js b/src/plugins/jquery.flot.threshold.js similarity index 100% rename from jquery.flot.threshold.js rename to src/plugins/jquery.flot.threshold.js diff --git a/jquery.flot.time.js b/src/plugins/jquery.flot.time.js similarity index 100% rename from jquery.flot.time.js rename to src/plugins/jquery.flot.time.js From d37ce8e3feada642bfefbe0b9a1c1c2a4e1451f8 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 28 Jan 2014 17:52:41 -0500 Subject: [PATCH 2/2] Update examples page script paths --- examples/ajax/index.html | 2 +- examples/annotating/index.html | 2 +- examples/axes-interacting/index.html | 2 +- examples/axes-multiple/index.html | 4 ++-- examples/axes-time-zones/index.html | 4 ++-- examples/axes-time/index.html | 4 ++-- examples/basic-options/index.html | 2 +- examples/basic-usage/index.html | 2 +- examples/canvas/index.html | 6 +++--- examples/categories/index.html | 4 ++-- examples/image/index.html | 4 ++-- examples/index.html | 2 +- examples/interacting/index.html | 2 +- examples/markings/index.html | 4 ++-- examples/navigate/index.html | 4 ++-- examples/percentiles/index.html | 4 ++-- examples/realtime/index.html | 2 +- examples/resize/index.html | 4 ++-- examples/selection/index.html | 4 ++-- examples/series-errorbars/index.html | 6 +++--- examples/series-pie/index.html | 4 ++-- examples/series-toggle/index.html | 2 +- examples/series-types/index.html | 2 +- examples/stacking/index.html | 4 ++-- examples/symbols/index.html | 4 ++-- examples/threshold/index.html | 4 ++-- examples/tracking/index.html | 4 ++-- examples/visitors/index.html | 6 +++--- examples/zooming/index.html | 4 ++-- 29 files changed, 51 insertions(+), 51 deletions(-) diff --git a/examples/ajax/index.html b/examples/ajax/index.html index be0ff74..ea100a4 100644 --- a/examples/ajax/index.html +++ b/examples/ajax/index.html @@ -7,7 +7,7 @@ - + - + - + - - + + - - + + - - + + - + - + - - - + + + - - + + - - + + - + - + - - + + - - + + - - + + - + - - + + - - + + - - - + + + - - + + - + - + - - + + - - + + - - + + - - + + - - - + + + - - + +