Skip to content

Commit 18ebaee

Browse files
committed
update submodule
1 parent 8186e06 commit 18ebaee

59 files changed

Lines changed: 1308 additions & 944 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
[submodule "src/assets/submodule/autosize"]
2929
path = src/assets/submodule/autosize
3030
url = https://github.com/jackmoore/autosize.git
31-
[submodule "src/assets/submodule/validVal"]
32-
path = src/assets/submodule/validVal
33-
url = https://github.com/FrDH/jquery.validVal.git
3431
[submodule "src/assets/submodule/wysihtml5"]
3532
path = src/assets/submodule/wysihtml5
3633
url = https://github.com/jhollingworth/bootstrap-wysihtml5.git
@@ -64,3 +61,6 @@
6461
[submodule "src/assets/submodule/tagsinput"]
6562
path = src/assets/submodule/tagsinput
6663
url = https://github.com/xoxco/jQuery-Tags-Input.git
64+
[submodule "src/assets/submodule/validVal"]
65+
path = src/assets/submodule/validVal
66+
url = https://github.com/BeSite/jQuery.validVal.git

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@ language: node_js
22
node_js:
33
- 0.10
44
before_script:
5-
- "node_modules/bower/bin/bower install"
6-
- "node_modules/grunt-cli/bin/grunt"
5+
- "npm install -g grunt-cli"
6+
- "npm install -g bower"
7+
- "bower install"
8+
- "grunt"

dist/assets/lib/flot/jquery.flot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ Licensed under the MIT license.
13471347
ticks = axis.ticks || [],
13481348
labelWidth = opts.labelWidth || 0,
13491349
labelHeight = opts.labelHeight || 0,
1350-
maxWidth = labelWidth || axis.direction == "x" ? Math.floor(surface.width / (ticks.length || 1)) : null,
1350+
maxWidth = labelWidth || (axis.direction == "x" ? Math.floor(surface.width / (ticks.length || 1)) : null),
13511351
legacyStyles = axis.direction + "Axis " + axis.direction + axis.n + "Axis",
13521352
layer = "flot-" + axis.direction + "-axis flot-" + axis.direction + axis.n + "-axis " + legacyStyles,
13531353
font = opts.font || "flot-tick-label tickLabel";

0 commit comments

Comments
 (0)