modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
| 11 +++++
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
| 20 +++-------
2 files changed, 18 insertions(+), 13 deletions(-)
New commits:
commit 93a7c3264c30a6ea08d2c767fa6f087a3a86aa1d
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Wed May 1 07:54:40 2013 -0700
Fix IE issues with "Move jquery(1.7.2) library out of CoreGUI.gwt.xml now that we
don't have GFlot dependency (GFlot was removed with addition of d3 charts)."
This reverts commit 8c54ef01abaa6790f49f96c492fe6649a0245a6f.
Revert "UI Performance - Move non-essential javascripts (like charting) out of
CoreGUI.gwt.xml to CoreGUI.html and add the 'defer' script evaluation attribute
for faster page load time. Also moved stylesheets to load ahead of javascripts as they
load faster and provide less blocking time than the external javascripts. This shaved
about 0.5 sec on my box will probably save more on slower hardware/connection/mobile. The
*.gwt.xml prevents race conditions at the expense of speed so moving out increases startup
speed."
This commit has unintended consequences for IE9 browser. Javascript
libraries that are supposed to be loaded are not (although this works in
other browsers).
This reverts commit e4ac4b1b628ae5e577510045ead7967a603d4c1c.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index 7d50e87..f3c93be 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -46,6 +46,17 @@
<when-type-assignable
class="com.google.gwt.user.client.rpc.RemoteService"/>
</generate-with>
+ <!-- External javascript libraries -->
+ <!-- jquery.sparkline requires jquery. We don't explicitly provide jquery here
because it is already
+ embedded in the GFlot JAR (the charting lib used for GraphPortlet).
Furthermore, GFlot 2.4.2 requires
+ the version of jquery (1.7.2).
+ -->
+ <script src="/coregui/js/jquery-1.7.2.min.js"/>
+ <script src="/coregui/js/jquery.sparkline-2.1.min.js"/>
+ <script src="/coregui/js/d3.v3.js"/>
+ <script src="/coregui/js/nv.d3.js"/>
+ <script src="/coregui/js/jquery.tipsy.js"/>
+
<!--
Limit compilation to your preferred browser(s) to speed up compile time.
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
index 1b69b53..206b586 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
@@ -10,19 +10,7 @@
<!-- support internationalized characters -->
<meta http-equiv="Content-Type"
content="text/html;charset=UTF-8" />
- <link rel="stylesheet" href="CoreGUI.css">
- <link rel="stylesheet" href="css/nv.d3.css">
- <link rel="stylesheet" href="css/tipsy.css">
- <link rel="stylesheet" href="css/charts.css">
-
- <script defer="defer" type="text/javascript"
src="/coregui/js/rhq.js"></script>
- <script defer="defer" type="text/javascript"
src="/coregui/js/d3.v3.js"></script>
- <script defer="defer" type="text/javascript"
src="/coregui/js/nv.d3.js"></script>
- <!-- jquery dependent js libs -->
- <script defer="defer" type="text/javascript"
src="/coregui/js/jquery-1.7.2.min.js"></script>
- <script defer="defer" type="text/javascript"
src="/coregui/js/jquery.sparkline-2.1.min.js"></script>
- <script defer="defer" type="text/javascript"
src="/coregui/js/jquery.tipsy.js"></script>
-
+ <script type="text/javascript"
src="js/rhq.js"></script>
<script type="text/javascript">
var search = location.search;
// only do this if you have not specified locale as query param
@@ -42,6 +30,12 @@
var isomorphicDir = "org.rhq.enterprise.gui.coregui.CoreGUI/sc/";
</script>
+
+ <link rel="stylesheet" href="CoreGUI.css">
+ <link rel="stylesheet" href="css/nv.d3.css">
+ <link rel="stylesheet" href="css/tipsy.css">
+ <link rel="stylesheet" href="css/charts.css">
+
</head>
<body>
Show replies by date