Skip to content

Commit 708c6e5

Browse files
committed
Merge branch 'master' into image-test
2 parents 60efb07 + c3c71e6 commit 708c6e5

File tree

52 files changed

+358
-122
lines changed

Some content is hidden

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

52 files changed

+358
-122
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ node_modules
33
build/*
44
!build/README.md
55

6+
dist/*
7+
!dist/README.md
8+
69
npm-debug.log

.jshintrc

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
// environments
3+
"browser": true, // Define globals exposed by modern browsers.
4+
"jquery": false, // Define globals exposed by jQuery.
5+
"node": true, // Define globals exposed by Node.js.
6+
"jasmine": true, // Define globals exposed by jasmine
7+
8+
// enforcing (true means bug us about it)
9+
"camelcase": false, // Force all variable names to use either camelCase style or UPPER_CASE with underscores.
10+
"curly": false, // This option requires you to always put curly braces around blocks in loops and conditionals.
11+
"eqeqeq": true, // Prohibit use of == and != in favor of === and !==.
12+
"es3": true, // This option tells JSHint that your code needs to adhere to ECMAScript 3 spec (old browsers)
13+
"forin": false, // This option requires all for in loops to filter object's items.
14+
"freeze": true, // This options prohibits overwriting prototypes of native objects such as Array, Date and so on.
15+
"immed": true, // This option prohibits the use of immediate function invocations without wrapping them in parentheses.
16+
"indent": 4, // Enforce tab width of 4 spaces.
17+
"latedef": "nofunc", // Prohibit use of a variable before it is defined.
18+
"maxcomplexity": false, // This option lets you control cyclomatic complexity throughout your code.
19+
"maxdepth": 6, // This option lets you control how nested do you want your blocks to be
20+
"maxlen": 120, // Enforce line length to 120 characters
21+
"newcap": true, // Require capitalized names for constructor functions.
22+
"noarg": true, // This option prohibits the use of arguments.caller and arguments.callee.
23+
"noempty": true, // This option warns when you have an empty block in your code.
24+
"nonbsp": true, // This option warns about "non-breaking whitespace" characters.
25+
"nonew": true, // This option prohibits the use of constructor functions for side-effects.
26+
"plusplus": false, // This option prohibits the use of unary increment and decrement operators.
27+
"quotmark": "single", // Enforce use of single quotation marks for strings.
28+
"strict": true, // Enforce placing 'use strict' at the top function scope
29+
"trailing": true, // Prohibit trailing whitespace.
30+
"undef": true, // Prohibit use of explicitly undeclared variables.
31+
"unused": true, // Warn when variables are defined but never used.
32+
33+
// relaxing (true means DON'T bug us about it)
34+
"asi": false, // This option suppresses warnings about missing semicolons.
35+
"boss": false, // This option suppresses warnings about the use of assignments in cases where comparisons are expected.
36+
"debug": false, // This option suppresses warnings about the debugger statements in your code.
37+
"eqnull": true, // Suppress warnings about == null comparisons.
38+
"esnext": true, // This option tells JSHint that your code uses ECMAScript 6 specific syntax.
39+
"evil": false, // This option suppresses warnings about the use of eval.
40+
"expr": false, // This option suppresses warnings about the use of expressions where normally you would expect to see assignments or function calls.
41+
"funcscope": false, // This option suppresses warnings about declaring variables inside of control structures while accessing them later from the outside.
42+
"globalstrict": false, // This option suppresses warnings about the use of global strict mode.
43+
"iterator": false, // This option suppresses warnings about the __iterator__ property.
44+
"lastsemic": false, // This option suppresses warnings about missing semicolons
45+
"laxbreak": false, // This option suppresses most of the warnings about possibly unsafe line breakings in your code.
46+
"laxcomma": false, // This option suppresses warnings about comma-first coding style
47+
"loopfunc": false, // This option suppresses warnings about functions inside of loops.
48+
"maxerr": 500, // This options allows you to set the maximum amount of warnings JSHint will produce before giving up.
49+
"moz": false, // This options tells JSHint that your code uses Mozilla JavaScript extensions.
50+
"multistr": false, // This option suppresses warnings about multi-line strings.
51+
"notypeof": false, // This option suppresses warnings about invalid typeof operator values.
52+
"proto": false, // This option suppresses warnings about the __proto__ property.
53+
"scripturl": false, // This option suppresses warnings about the use of script-targeted URLs—such as javascript:...
54+
"shadow": false, // This option suppresses warnings about variable shadowing
55+
"sub": false, // This option suppresses warnings about using [] notation when it can be expressed in dot notation
56+
"supernew": false, // This option suppresses warnings about "weird" constructions like new function () { ... } and new Object;
57+
"validthis": false, // This option suppresses warnings about possible strict violations when the code is running in strict mode
58+
"noyield": false, // This option suppresses warnings about generator functions with no yield statement in them.
59+
60+
// global pre defined variables
61+
"predef": [
62+
"JSON",
63+
"Uint8Array",
64+
"Uint16Array",
65+
"Uint32Array",
66+
"Int8Array",
67+
"Int16Array",
68+
"Int32Array",
69+
"Float32Array",
70+
"Float64Array"
71+
]
72+
}

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 Plotly, Inc
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

README.md

Lines changed: 92 additions & 0 deletions

devtools/test_dashboard/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var browserify = require('browserify');
66
var ecstatic = require('ecstatic');
77
var _open = require('open');
88

9-
var makeWatchifiedBundle = require('../../tasks/watch_plotly');
9+
var makeWatchifiedBundle = require('../../tasks/util/make_watchified_bundle');
1010
var shortcutPaths = require('../../tasks/util/shortcut_paths');
1111
var constants = require('../../tasks/util/constants');
1212

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@
4343
],
4444
"scripts": {
4545
"preprocess": "node tasks/preprocess.js",
46+
"postinstall": "npm run preprocess",
4647
"bundle": "node tasks/bundle.js",
4748
"build": "npm run preprocess && npm run bundle",
4849
"watch": "node tasks/watch_plotly.js",
50+
"lint": "cd src && jshint . || true",
4951
"test-jasmine": "karma start test/jasmine/karma.conf.js",
5052
"test-image": "node test/image/compare_pixels_test.js",
5153
"test": "npm run test-jasmine && npm test-image",
@@ -97,6 +99,7 @@
9799
"browserify-transform-tools": "^1.5.0",
98100
"ecstatic": "^1.2.0",
99101
"jasmine-core": "^2.3.4",
102+
"jshint": "^2.8.0",
100103
"karma": "^0.13.15",
101104
"karma-browserify": "^4.4.0",
102105
"karma-chrome-launcher": "^0.2.1",
File renamed without changes.

0 commit comments

Comments
 (0)