Skip to content

Commit

Permalink
Merge pull request #1230 from nschonni/reorg-file-tree
Browse files Browse the repository at this point in the history 
Move JS files under src directory
  • Loading branch information
@dnschnur
dnschnur committed Feb 3, 2014
2 parents a3a1404 + d37ce8e commit 8d8973e
Show file tree
Hide file tree
Showing 45 changed files with 53 additions and 53 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
View file
Expand Up @@ -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");
Expand All @@ -29,7 +29,7 @@ module.exports = function(grunt) {
src: "Gruntfile.js"
},
flot: {
src: ["jquery.flot*.js"]
src: ["src/**/*.js"]
}
},
watch: {
Expand Down
2 changes: 1 addition & 1 deletion examples/ajax/index.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/annotating/index.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/axes-interacting/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/axes-multiple/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/axes-time-zones/index.html
View file
Expand Up @@ -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">

Expand Down
4 changes: 2 additions & 2 deletions examples/axes-time/index.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-options/index.html
View file
Expand Up @@ -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 () {
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-usage/index.html
View file
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions examples/canvas/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/categories/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/image/index.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/index.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/interacting/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/markings/index.html
View file
Expand Up @@ -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 () {
Expand Down
4 changes: 2 additions & 2 deletions examples/navigate/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/percentiles/index.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/realtime/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/resize/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/selection/index.html
View file
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions examples/series-errorbars/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/series-pie/index.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/series-toggle/index.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/series-types/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/stacking/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/symbols/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/threshold/index.html
View file
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions examples/tracking/index.html
View file
Expand Up @@ -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() {
Expand Down

0 comments on commit 8d8973e

Please sign in to comment.