diff options
Diffstat (limited to 'toolkit/content')
| -rw-r--r-- | toolkit/content/license.html | 41 | ||||
| -rw-r--r-- | toolkit/content/plugins.html | 9 | ||||
| -rw-r--r-- | toolkit/content/widgets/toolbar.xml | 2 |
3 files changed, 1 insertions, 51 deletions
diff --git a/toolkit/content/license.html b/toolkit/content/license.html index 45889a191..a348fdfa6 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -103,7 +103,6 @@ <li><a href="about:license#icu">ICU License</a></li> <li><a href="about:license#immutable">Immutable.js License</a></li> <li><a href="about:license#jpnic">Japan Network Information Center License</a></li> - <li><a href="about:license#jemalloc">jemalloc License</a></li> <li><a href="about:license#jquery">jQuery License</a></li> <li><a href="about:license#k_exp">k_exp License</a></li> <li><a href="about:license#khronos">Khronos group License</a></li> @@ -3527,46 +3526,6 @@ Chiyoda-ku, Tokyo 101-0047, Japan. <hr> - <h1><a id="jemalloc"></a>jemalloc License</h1> - - <p>This license applies to files in the directories - <span class="path">memory/mozjemalloc/</span> and - <span class="path">memory/jemalloc/</span>. - </p> - -<pre> -Copyright (C) 2002-2012 Jason Evans <jasone@canonware.com>. -All rights reserved. -Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved. -Copyright (C) 2009-2012 Facebook, Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice(s), this list of conditions and the following disclaimer as - the first lines of this file unmodified other than the possible - addition of one or more copyright notices. -2. Redistributions in binary form must reproduce the above copyright - notice(s), this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -</pre> - - <hr> - <h1><a id="jquery"></a>jQuery License</h1> <p>This license applies to all copies of jQuery in the code.</p> diff --git a/toolkit/content/plugins.html b/toolkit/content/plugins.html index d389f52dd..15bbed9bb 100644 --- a/toolkit/content/plugins.html +++ b/toolkit/content/plugins.html @@ -75,15 +75,6 @@ enabledplugins.appendChild(document.createTextNode(pluginsbundle.GetStringFromName(label))); fragment.appendChild(enabledplugins); - var deprecation = document.createElement("p"); - deprecation.setAttribute("class", "notice"); - deprecation.textContent = pluginsbundle.GetStringFromName("deprecation_description") + " \u00A0 "; - var deprecationLink = document.createElement("a"); - deprecationLink.textContent = pluginsbundle.GetStringFromName("deprecation_learn_more"); - deprecationLink.href = Services.urlFormatter.formatURLPref("app.support.baseURL") + "npapi"; - deprecation.appendChild(deprecationLink); - fragment.appendChild(deprecation); - var stateNames = {}; ["STATE_SOFTBLOCKED", "STATE_BLOCKED", diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml index e1f58f7aa..55cef8244 100644 --- a/toolkit/content/widgets/toolbar.xml +++ b/toolkit/content/widgets/toolbar.xml @@ -54,7 +54,7 @@ // Look to see if there is a toolbarset. this.toolbarset = this.firstChild; while (this.toolbarset && this.toolbarset.localName != "toolbarset") { - this.toolbarset = toolbarset.nextSibling; + this.toolbarset = this.toolbarset.nextSibling; } if (this.toolbarset) { |