Skip to content

Commit

Permalink
Merge pull request #2927 from palantir/r-1.16.1
Browse files Browse the repository at this point in the history
Release version 1.16.1
  • Loading branch information
bluong committed Oct 23, 2015
2 parents 224f6d5 + bcc2a1f commit cc5dcb8
Show file tree
Hide file tree
Showing 163 changed files with 29,484 additions and 7,129 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"d3": true,
"Plottable": true,
"makeRandomData": true,
"makeRandomNamedData": true,
"deepCopy": true
},
"rules": {
Expand Down
5 changes: 3 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "plottable",
"description": "A modular charting library built on D3",
"version": "1.16.0",
"version": "1.16.1",
"main": ["plottable.js", "plottable.css"],
"typescript": {
"definition": "plottable.d.ts"
Expand Down Expand Up @@ -44,6 +44,7 @@
"mocha": "2.2.5",
"jQuery": "2.1.0",
"jquery.simulate": "1.2.0",
"requirejs": "2.1.18"
"requirejs": "2.1.18",
"sinon": "1.16.1"
}
}
14 changes: 14 additions & 0 deletions bower_components/sinon/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "sinon",
"homepage": "https://github.com/cjohansen/Sinon.JS",
"version": "1.16.1",
"_release": "1.16.1",
"_resolution": {
"type": "version",
"tag": "v1.16.1",
"commit": "38799cceb076a8190f60a41da234dcef0292ef64"
},
"_source": "git://github.com/cjohansen/Sinon.JS.git",
"_target": "1.16.1",
"_originalSource": "sinon"
}
17 changes: 17 additions & 0 deletions bower_components/sinon/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
; EditorConfig file: http://EditorConfig.org
; Install the "EditorConfig" plugin into your editor to use

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

# Matches the exact files either package.json or .travis.yml
[{package.json, .travis.yml}]
indent_style = space
indent_size = 2
2 changes: 2 additions & 0 deletions bower_components/sinon/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
coverage/
pkg/
189 changes: 189 additions & 0 deletions bower_components/sinon/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
{
"ecmaFeatures": {},
"env": {
"browser": true,
"node": true,
"amd": true
},
"rules": {
"no-alert": 2,
"no-array-constructor": 2,
"no-bitwise": 2,
"no-caller": 2,
"no-catch-shadow": 2,
"no-comma-dangle": 2,
"no-cond-assign": 2,
"no-console": 2,
"no-constant-condition": 2,
"no-continue": 2,
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-div-regex": 0,
"no-dupe-keys": 2,
"no-dupe-args": 2,
"no-duplicate-case": 2,
"no-else-return": 2,
"no-empty": 2,
"no-empty-character-class": 2,
"no-empty-label": 2,
"no-eq-null": 0,
"no-eval": 2,
"no-ex-assign": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": 0,
"no-extra-semi": 2,
"no-extra-strict": 2,
"no-fallthrough": 2,
"no-floating-decimal": 0,
"no-func-assign": 2,
"no-implied-eval": 2,
"no-inline-comments": 0,
"no-inner-declarations": [2, "functions"],
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-iterator": 2,
"no-label-var": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-lonely-if": 0,
"no-loop-func": 2,
"no-mixed-requires": [0, false],
"no-mixed-spaces-and-tabs": [2, false],
"linebreak-style": [0, "unix"],
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-multiple-empty-lines": [2, {"max": 2}],
"no-native-reassign": 2,
"no-negated-in-lhs": 2,
"no-nested-ternary": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-object": 2,
"no-new-require": 0,
"no-new-wrappers": 2,
"no-obj-calls": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-param-reassign": 0,
"no-path-concat": 0,
"no-plusplus": 0,
"no-process-env": 0,
"no-process-exit": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-reserved-keys": 0,
"no-restricted-modules": 0,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 0,
"no-sequences": 2,
"no-shadow": 2,
"no-shadow-restricted-names": 2,
"no-space-before-semi": 0,
"no-spaced-func": 2,
"no-sparse-arrays": 2,
"no-sync": 0,
"no-ternary": 0,
"no-trailing-spaces": 2,
"no-this-before-super": 0,
"no-throw-literal": 0,
"no-undef": 2,
"no-undef-init": 2,
"no-undefined": 0,
"no-unexpected-multiline": 0,
"no-underscore-dangle": 2,
"no-unneeded-ternary": 0,
"no-unreachable": 2,
"no-unused-expressions": 2,
"no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
"no-use-before-define": 2,
"no-void": 0,
"no-var": 0,
"prefer-const": 0,
"no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
"no-with": 2,
"no-wrap-func": 2,

"array-bracket-spacing": [2, "never"],
"accessor-pairs": 2,
"block-scoped-var": 0,
"brace-style": [0, "1tbs"],
"callback-return": 0,
"camelcase": 2,
"comma-dangle": [2, "never"],
"comma-spacing": 2,
"comma-style": 2,
"complexity": [0, 11],
"computed-property-spacing": [0, "never"],
"consistent-return": 2,
"consistent-this": [0, "that"],
"constructor-super": 0,
"curly": [2, "all"],
"default-case": 1,
"dot-location": 0,
"dot-notation": [2, { "allowKeywords": true }],
"eol-last": 2,
"eqeqeq": 2,
"func-names": 0,
"func-style": [0, "declaration"],
"generator-star": 0,
"generator-star-spacing": 0,
"global-strict": [2, "never"],
"guard-for-in": 2,
"handle-callback-err": 0,
"indent": [2, 4, {"indentSwitchCase": true}],
"init-declarations": 0,
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
"lines-around-comment": 0,
"max-depth": [0, 4],
"max-len": [2, 120, 4],
"max-nested-callbacks": [1, 2],
"max-params": [0, 3],
"max-statements": [0, 10],
"new-cap": 2,
"new-parens": 2,
"newline-after-var": 0,
"object-curly-spacing": [0, "never"],
"object-shorthand": 0,
"one-var": [2, {
// Exactly one declaration for uninitialized variables per function (var) or block (let or const)
"uninitialized": "always",
// Exactly one declarator per initialized variable declaration per function (var) or block (let or const)
"initialized": "never"
}],
"operator-assignment": [0, "always"],
"operator-linebreak": 0,
"padded-blocks": 0,
"quote-props": 0,
"quotes": [2, "double"],
"radix": 0,
"require-yield": 0,
"semi": 2,
"semi-spacing": [2, {"before": false, "after": true}],
"sort-vars": 0,
"space-after-function-name": [2, "never"],
"space-after-keywords": [2, "always"],
"space-before-blocks": [2, "always"],
"space-before-function-paren": [2, {"anonymous": "always", "named": "never"}],
"space-before-function-parentheses": [0, "always"],
"space-in-brackets": [0, "never"],
"space-in-parens": [0, "never"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"spaced-comment": 0,
"spaced-line-comment": [0, "always"],
"strict": 2,
"use-isnan": 2,
"valid-jsdoc": 0,
"valid-typeof": 2,
"vars-on-top": 0,
"wrap-iife": 0,
"wrap-regex": 0,
"yoda": [2, "never"]
}
}
3 changes: 3 additions & 0 deletions bower_components/sinon/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pkg
node_modules
coverage/
15 changes: 15 additions & 0 deletions bower_components/sinon/.jscsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// should allow comments in this type of config
{
"excludeFiles": [
"coverage",
"node_modules/**",
"build/*",
"coverage/*",
"pkg/*"
],
"preset": "crockford",

// Sinon specific overrides
"validateQuoteMarks" : "\"",
"requireMultipleVarDecl" : null
}
32 changes: 32 additions & 0 deletions bower_components/sinon/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
language: node_js
node_js:
- "0.8"
- "0.10"
- "0.12"

sudo: false

before_install:
- npm config set strict-ssl false
# use a more modern npm than ships with 0.8
- 'if [ "x$TRAVIS_NODE_VERSION" = "x0.8" ]; then npm install -g [email protected]; fi'
# Workaround for intermittent build failures
# install buster separately from `npm install`, as it uses the C compiler, which might cause the
# npm ERR! cb() never called!
# errror to appear, causing the builds to fail
#
# See this discussion: https://github.com/npm/npm/issues/7014
- npm install [email protected]

before_script:
- rvm install 2.2.0
- rvm use 2.2.0 --default
- gem install juicer
# we only need to run eslint once per build, so let's conserve a few resources
- 'if [ "x$TRAVIS_NODE_VERSION" = "x0.12" ]; then $(npm bin)/eslint .; fi'

script:
- ./scripts/ci-test.sh

git:
depth: 10
Loading

0 comments on commit cc5dcb8

Please sign in to comment.