You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/12/22 14:47:47 UTC

[4/8] incubator-brooklyn git commit: remove duplicate jquery js load

remove duplicate jquery js load

this was breaking superfish; but things seemed to be working, so maybe we don't need superfish!


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3e8334af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3e8334af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3e8334af

Branch: refs/heads/master
Commit: 3e8334afb8b4369ef834dff96620ebff6c14ad38
Parents: e6307ed
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Dec 19 10:16:29 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Dec 19 11:44:10 2014 +0000

----------------------------------------------------------------------
 docs/_includes/base-head.html | 3 +++
 docs/_layouts/base.html       | 4 +---
 docs/_layouts/guide-base.html | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3e8334af/docs/_includes/base-head.html
----------------------------------------------------------------------
diff --git a/docs/_includes/base-head.html b/docs/_includes/base-head.html
index 9afadea..ed15d08 100644
--- a/docs/_includes/base-head.html
+++ b/docs/_includes/base-head.html
@@ -10,3 +10,6 @@
 <link rel="stylesheet" href="{{ site.path.style }}/css/code.css" type="text/css" media="screen" />
 
 <link href="{{site.path.style}}/css/base.css" rel="stylesheet">
+
+<script src="{% dependency_url jquery.js %}"></script>
+<script src="{% dependency_url bootstrap.js %}"></script>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3e8334af/docs/_layouts/base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
index da97748..c6713b2 100644
--- a/docs/_layouts/base.html
+++ b/docs/_layouts/base.html
@@ -20,11 +20,9 @@ under the License.
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
-{{ content }}
 
+{{ content }}
 
-<script src="{% dependency_url jquery.js %}"></script>
-<script src="{% dependency_url bootstrap.js %}"></script>
 
 <script language="JavaScript" type="application/javascript">
     $(window).resize(function () { 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3e8334af/docs/_layouts/guide-base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/guide-base.html b/docs/_layouts/guide-base.html
index eecb5ea..3facdb6 100644
--- a/docs/_layouts/guide-base.html
+++ b/docs/_layouts/guide-base.html
@@ -29,7 +29,6 @@ layout: base
     <script type="text/javascript" src="https://www.google.com/jsapi"></script>
   
 	<!-- Sidebar/ToC Scripts and CSS -->
-	<script src="{{ site.path.style }}/deps/jquery.js"></script>
 	<script src="{{ site.path.style }}/deps/jquery-ui/jquery-ui-1.8.18.custom.min.js"></script>
 	<link rel="stylesheet" type="text/css" href="{{ site.path.style }}/deps/jquery-ui/jquery-ui-1.8.18.custom.css" />
 	
@@ -77,8 +76,8 @@ $(document).ready(function() {
 
     <script type="text/javascript">
         // initialise menu delay
-        jQuery(function(){
-            jQuery('ul#mainmenu').superfish({ 
+        $(document).ready(function() {
+              $('ul#mainmenu').superfish({ 
                 autoArrows:  false,  // disable generation of arrow mark-up 
                 dropShadows: false,  // disable drop shadows 
                 disableHI:   true,   // set to true to disable hoverIntent detection