aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-02-26 17:49:53 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-02-26 17:50:11 -0600
commit8db7eed3bcba5c0527befc48a9d2b84cf5be62a8 (patch)
tree3108b633a1ab349603693a1cb74bb3a152ef77c5
parent6bdf9a104428543840c4967ac21518af3dc60bea (diff)
downloadmediagoblin-8db7eed3bcba5c0527befc48a9d2b84cf5be62a8.tar.lz
mediagoblin-8db7eed3bcba5c0527befc48a9d2b84cf5be62a8.tar.xz
mediagoblin-8db7eed3bcba5c0527befc48a9d2b84cf5be62a8.zip
Removing html5shiv for not complying with its own licenses and racism
Issues of racism seem to have been resolved and removed from upstream, but make having this as a dependency somewhat uncomfortable: https://github.com/aFarkas/html5shiv/issues/91 Regardless, at the time of writing the project doesn't comply with its own license... it states to be dual licensed under MIT and GPLv2 but distributes neither of these licenses with its source.
-rw-r--r--extlib/html5shiv/MIT.txt20
-rw-r--r--extlib/html5shiv/html5shiv.js3
l---------mediagoblin/static/js/extlib/html5shiv.js1
-rw-r--r--mediagoblin/templates/mediagoblin/base.html4
4 files changed, 0 insertions, 28 deletions
diff --git a/extlib/html5shiv/MIT.txt b/extlib/html5shiv/MIT.txt
deleted file mode 100644
index 5a2aeb47..00000000
--- a/extlib/html5shiv/MIT.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) <year> <copyright holders>
-
-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.
diff --git a/extlib/html5shiv/html5shiv.js b/extlib/html5shiv/html5shiv.js
deleted file mode 100644
index 8de0ff54..00000000
--- a/extlib/html5shiv/html5shiv.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// HTML5 Shiv v3 | @jon_neal @afarkas @rem | MIT/GPL2 Licensed
-// Uncompressed source: https://github.com/aFarkas/html5shiv
-(function(a,b){var c=function(a){return a.innerHTML="<x-element></x-element>",a.childNodes.length===1}(b.createElement("a")),d=function(a,b,c){return b.appendChild(a),(c=(c?c(a):a.currentStyle).display)&&b.removeChild(a)&&c==="block"}(b.createElement("nav"),b.documentElement,a.getComputedStyle),e={elements:"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video".split(" "),shivDocument:function(a){a=a||b;if(a.documentShived)return;a.documentShived=!0;var f=a.createElement,g=a.createDocumentFragment,h=a.getElementsByTagName("head")[0],i=function(a){f(a)};c||(e.elements.join(" ").replace(/\w+/g,i),a.createElement=function(a){var b=f(a);return b.canHaveChildren&&e.shivDocument(b.document),b},a.createDocumentFragment=function(){return e.shivDocument(g())});if(!d&&h){var j=f("div");j.innerHTML=["x<style>","article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}","audio{display:none}","canvas,video{display:inline-block;*display:inline;*zoom:1}","[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}","mark{background:#FF0;color:#000}","</style>"].join(""),h.insertBefore(j.lastChild,h.firstChild)}return a}};e.shivDocument(b),a.html5=e})(this,document) \ No newline at end of file
diff --git a/mediagoblin/static/js/extlib/html5shiv.js b/mediagoblin/static/js/extlib/html5shiv.js
deleted file mode 120000
index ca7358c7..00000000
--- a/mediagoblin/static/js/extlib/html5shiv.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../extlib/html5shiv/html5shiv.js \ No newline at end of file
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 13433b33..66b95661 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -32,10 +32,6 @@
<script type="text/javascript"
src="{{ request.staticdirect('/js/header_dropdown.js') }}"></script>
- <!--[if lt IE 9]>
- <script src="{{ request.staticdirect('/js/extlib/html5shiv.js') }}"></script>
- <![endif]-->
-
{# For clarification, the difference between the extra_head.html template
# and the head template hook is that the former should be used by
# themes and the latter should be used by plugins.