Skip to content

Commit

Permalink
base1: Use a forked version of term.js
Browse files Browse the repository at this point in the history
We'll use a forked version of term.js for now. It includes the
following pull requests not yet merged upstream:

 * Support for Content-Security-Policy
   chjj/term.js#115

 * Define itself as an AMD module when running under AMD
   chjj/term.js#116

https://github.com/cockpit-project/term.js
  • Loading branch information
stefwalter committed Mar 10, 2016
1 parent bdc54f2 commit 93f2389
Show file tree
Hide file tree
Showing 6 changed files with 6,023 additions and 5,737 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"qunit": "#1.14.0",
"qunit-tap": "#1.5.0",
"requirejs": "#2.1.16",
"term.js": "#0.0.3",
"term.js-cockpit": "#0.0.7",
"jquery-amend": "cockpit-project/jquery-amend"
}
}
2 changes: 1 addition & 1 deletion bower_components/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ tests-src/

/requirejs/

/term.js/
/term.js-cockpit/index.js
19 changes: 19 additions & 0 deletions bower_components/term.js-cockpit/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2012-2013, Christopher Jeffrey (https://github.com/chjj/)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Loading

0 comments on commit 93f2389

Please sign in to comment.