Skip to content

Commit f5a1920

Browse files
author
Aurélien Ooms
authored
Merge branch 'master' into greenkeeper/update-all
2 parents 8f887ba + f97b97e commit f5a1920

40 files changed

+532
-318
lines changed

.codacy.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
languages:
2+
JavaScript: true
3+
exclude_paths:
4+
- "doc/**"
5+
- "lib/**"
6+
- "test/**"

.codeclimate.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
languages:
22
JavaScript: true
33
exclude_paths:
4-
- "js/dist/*.js"
5-
- "js/dist/**/*.js"
6-
- "test/*.js"
7-
- "test/**/*.js"
4+
- "doc/**"
5+
- "lib/**"
6+
- "test/**"

.gitignore

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,10 @@
1-
# Logs
2-
logs
3-
*.log
4-
5-
# Runtime data
6-
pids
7-
*.pid
8-
*.seed
9-
10-
# Directory for instrumented libs generated by jscoverage/JSCover
11-
lib-cov
12-
13-
# Coverage directory used by tools like istanbul
14-
coverage
15-
16-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
17-
.grunt
18-
19-
# node-waf configuration
20-
.lock-wscript
21-
22-
# Compiled binary addons (http://nodejs.org/api/addons.html)
23-
build/Release
24-
251
# Dependency directory
26-
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
272
node_modules
3+
jspm_packages
4+
5+
# Coverage directory used by nyc
6+
coverage
7+
.nyc_output
288

29-
# groc
30-
doc
9+
# Documentation
10+
gh-pages

.groc.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

.travis.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
language: node_js
22

33
node_js:
4-
- "iojs"
5-
- "0.12"
6-
- "0.11"
7-
- "0.10"
4+
- node
85

96
install:
10-
- npm -d install
7+
- npm install
118

129
script:
13-
- npm test
10+
- npm run cover
1411

1512
after_success:
16-
- ./node_modules/.bin/coveralls < coverage/lcov.info || true
17-
- ./node_modules/.bin/codeclimate < coverage/lcov.info || true
13+
- bash <(curl -s https://codecov.io/bash) || true
14+
- coveralls < coverage/lcov.info || true
15+
- codeclimate-test-reporter < coverage/lcov.info || true

README.md

Lines changed: 15 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,18 @@
1-
[js-2sat](http://aureooms.github.io/js-2sat)
1+
[@aureooms/js-2sat](https://aureooms.github.io/js-2sat)
22
==
33

4-
2-Satisfiability code bricks for JavaScript
4+
2-Satisfiability library for JavaScript.
5+
See [docs](https://aureooms.github.io/js-2sat).
6+
Parent is [@aureooms/js-algorithms](https://github.com/aureooms/js-algorithms).
7+
8+
[![License](https://img.shields.io/github/license/aureooms/js-2sat.svg?style=flat)](https://raw.githubusercontent.com/aureooms/js-2sat/master/LICENSE)
9+
[![NPM version](https://img.shields.io/npm/v/@aureooms/js-2sat.svg?style=flat)](https://www.npmjs.org/package/@aureooms/js-2sat)
10+
[![Build Status](https://img.shields.io/travis/aureooms/js-2sat.svg?style=flat)](https://travis-ci.org/aureooms/js-2sat)
11+
[![Coverage Status](https://img.shields.io/coveralls/aureooms/js-2sat.svg?style=flat)](https://coveralls.io/r/aureooms/js-2sat)
12+
[![Dependencies Status](https://img.shields.io/david/aureooms/js-2sat.svg?style=flat)](https://david-dm.org/aureooms/js-2sat#info=dependencies)
13+
[![devDependencies Status](https://img.shields.io/david/dev/aureooms/js-2sat.svg?style=flat)](https://david-dm.org/aureooms/js-2sat#info=devDependencies)
14+
[![Code Climate](https://img.shields.io/codeclimate/github/aureooms/js-2sat.svg?style=flat)](https://codeclimate.com/github/aureooms/js-2sat)
15+
[![NPM downloads per month](https://img.shields.io/npm/dm/@aureooms/js-2sat.svg?style=flat)](https://www.npmjs.org/package/@aureooms/js-2sat)
16+
[![GitHub issues](https://img.shields.io/github/issues/aureooms/js-2sat.svg?style=flat)](https://github.com/aureooms/js-2sat/issues)
17+
[![Documentation](https://aureooms.github.io/js-2sat/badge.svg)](https://aureooms.github.io/js-2sat/source.html)
518

6-
[![NPM license](http://img.shields.io/npm/l/aureooms-js-2sat.svg?style=flat)](https://raw.githubusercontent.com/aureooms/js-2sat/master/LICENSE)
7-
[![NPM version](http://img.shields.io/npm/v/aureooms-js-2sat.svg?style=flat)](https://www.npmjs.org/package/aureooms-js-2sat)
8-
[![Bower version](http://img.shields.io/bower/v/aureooms-js-2sat.svg?style=flat)](http://bower.io/search/?q=aureooms-js-2sat)
9-
[![Build Status](http://img.shields.io/travis/aureooms/js-2sat.svg?style=flat)](https://travis-ci.org/aureooms/js-2sat)
10-
[![Coverage Status](http://img.shields.io/coveralls/aureooms/js-2sat.svg?style=flat)](https://coveralls.io/r/aureooms/js-2sat)
11-
[![Dependencies Status](http://img.shields.io/david/aureooms/js-2sat.svg?style=flat)](https://david-dm.org/aureooms/js-2sat#info=dependencies)
12-
[![devDependencies Status](http://img.shields.io/david/dev/aureooms/js-2sat.svg?style=flat)](https://david-dm.org/aureooms/js-2sat#info=devDependencies)
13-
[![Code Climate](http://img.shields.io/codeclimate/github/aureooms/js-2sat.svg?style=flat)](https://codeclimate.com/github/aureooms/js-2sat)
14-
[![NPM downloads per month](http://img.shields.io/npm/dm/aureooms-js-2sat.svg?style=flat)](https://www.npmjs.org/package/aureooms-js-2sat)
15-
[![GitHub issues](http://img.shields.io/github/issues/aureooms/js-2sat.svg?style=flat)](https://github.com/aureooms/js-2sat/issues)
16-
[![Inline docs](http://inch-ci.org/github/aureooms/js-2sat.svg?branch=master&style=shields)](http://inch-ci.org/github/aureooms/js-2sat)
17-
18-
Can be managed through [jspm](https://github.com/jspm/jspm-cli),
19-
[duo](https://github.com/duojs/duo),
20-
[component](https://github.com/componentjs/component),
21-
[bower](https://github.com/bower/bower),
22-
[ender](https://github.com/ender-js/Ender),
23-
[jam](https://github.com/caolan/jam),
24-
[spm](https://github.com/spmjs/spm),
25-
and [npm](https://github.com/npm/npm).
26-
27-
## Install
28-
29-
### jspm
30-
```terminal
31-
jspm install github:aureooms/js-2sat
32-
# or
33-
jspm install npm:aureooms-js-2sat
34-
```
35-
### duo
36-
No install step needed for duo!
37-
38-
### component
39-
```terminal
40-
component install aureooms/js-2sat
41-
```
42-
43-
### bower
44-
```terminal
45-
bower install aureooms-js-2sat
46-
```
47-
48-
### ender
49-
```terminal
50-
ender add aureooms-js-2sat
51-
```
52-
53-
### jam
54-
```terminal
55-
jam install aureooms-js-2sat
56-
```
57-
58-
### spm
59-
```terminal
60-
spm install aureooms-js-2sat --save
61-
```
62-
63-
### npm
64-
```terminal
65-
npm install aureooms-js-2sat --save
66-
```
67-
68-
## Require
69-
### jspm
70-
```js
71-
let 2sat = require( "github:aureooms/js-2sat" ) ;
72-
// or
73-
import 2sat from 'aureooms-js-2sat' ;
74-
```
75-
### duo
76-
```js
77-
let 2sat = require( "aureooms/js-2sat" ) ;
78-
```
79-
80-
### component, ender, spm, npm
81-
```js
82-
let 2sat = require( "aureooms-js-2sat" ) ;
83-
```
84-
85-
### bower
86-
The script tag exposes the global variable `2sat`.
87-
```html
88-
<script src="bower_components/aureooms-js-2sat/js/dist/2sat.min.js"></script>
89-
```
90-
Alternatively, you can use any tool mentioned [here](http://bower.io/docs/tools/).
91-
92-
### jam
93-
```js
94-
require( [ "aureooms-js-2sat" ] , function ( 2sat ) { ... } ) ;
95-
```

bower.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

component.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

doc/css/style.css

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
h1,
2+
h2,
3+
.navigation,
4+
.layout-container > header,
5+
footer
6+
{
7+
border: none;
8+
}
9+
10+
.project-name {
11+
color: #FC913A;
12+
font-weight: bold;
13+
}
14+
15+
.layout-container > header > a.repo-url-github {
16+
font-size: inherit;
17+
display: inline;
18+
background: none;
19+
vertical-align: inherit;
20+
}
21+
22+
.search-box img {
23+
display: none;
24+
}
25+
26+
.search-box::before{
27+
content: "search";
28+
}
29+
30+
.search-input-edge {
31+
height: 0px;
32+
}
33+
34+
.search-result {
35+
width: 300px;
36+
margin-left: 42px;
37+
box-shadow: 1px 1px 13px rgba(0,0,0,0.2);
38+
}
39+
40+
.search-input {
41+
visibility: visible;
42+
}
43+
44+
.search-result li.search-separator {
45+
text-transform: capitalize;
46+
background-color: #ccc;
47+
}
48+
49+
span[data-ice="signature"] > span {
50+
/*font-weight: bold;*/
51+
font-style: italic;
52+
}

doc/manual/example.md

Whitespace-only changes.

doc/manual/installation.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Can be managed using
2+
[jspm](http://jspm.io)
3+
or [npm](https://github.com/npm/npm).
4+
5+
### jspm
6+
```terminal
7+
jspm install npm:@aureooms/js-2sat
8+
```
9+
10+
### npm
11+
```terminal
12+
npm install @aureooms/js-2sat --save
13+
```

doc/manual/overview.md

Whitespace-only changes.

doc/manual/usage.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
The code needs a ES2015+ polyfill to work, for example
2+
[babel-polyfill](https://babeljs.io/docs/usage/polyfill).
3+
```js
4+
require( 'babel-polyfill' ) ;
5+
// or
6+
import 'babel-polyfill' ;
7+
```
8+
9+
Then
10+
```js
11+
const 2sat = require( '@aureooms/js-2sat' ) ;
12+
// or
13+
import 2sat from '@aureooms/js-2sat' ;
14+
```

doc/scripts/header.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
var domReady = function(callback) {
2+
var state = document.readyState ;
3+
if ( state === 'interactive' || state === 'complete' ) {
4+
callback() ;
5+
}
6+
else {
7+
document.addEventListener('DOMContentLoaded', callback);
8+
}
9+
} ;
10+
11+
12+
domReady(function(){
13+
14+
var projectname = document.createElement('a');
15+
projectname.classList.add('project-name');
16+
projectname.text = 'aureooms/js-2sat';
17+
projectname.href = './index.html' ;
18+
19+
var header = document.getElementsByTagName('header')[0] ;
20+
header.insertBefore(projectname,header.firstChild);
21+
22+
var testlink = document.querySelector('header > a[data-ice="testLink"]') ;
23+
testlink.href = 'https://coveralls.io/github/aureooms/js-2sat' ;
24+
testlink.target = '_BLANK' ;
25+
26+
var searchBox = document.querySelector('.search-box');
27+
var input = document.querySelector('.search-input');
28+
29+
// active search box when focus on searchBox.
30+
input.addEventListener('focus', function(){
31+
searchBox.classList.add('active');
32+
});
33+
34+
});

esdoc.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"source": "./src",
3+
"destination": "./gh-pages",
4+
"access": [
5+
"public",
6+
"protected",
7+
"private"
8+
],
9+
"debug": false,
10+
"index": "./README.md",
11+
"package": "./package.json",
12+
"title": "aureooms/js-2sat",
13+
"test": {
14+
"type": "ava",
15+
"source": "./test/src"
16+
},
17+
"manual": {
18+
"overview": [
19+
"./doc/manual/overview.md"
20+
],
21+
"installation": [
22+
"./doc/manual/installation.md"
23+
],
24+
"usage": [
25+
"./doc/manual/usage.md"
26+
],
27+
"example": [
28+
"./doc/manual/example.md"
29+
]
30+
},
31+
"styles": [
32+
"./doc/css/style.css"
33+
],
34+
"scripts": [
35+
"./doc/scripts/header.js"
36+
]
37+
}

inch.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)