Author: dejanb
Date: Thu Feb 4 09:39:17 2010
New Revision: 906418
URL: http://svn.apache.org/viewvc?rev=906418&view=rev
Log:
merging 906416 - https://issues.apache.org/activemq/browse/AMQ-2410 - fixing js
errors
Modified:
activemq/branches/activemq-5.3/activemq-web-console/src/main/webapp/decorators/main.jsp
activemq/branches/activemq-5.3/activemq-web-console/src/main/webapp/js/standardista-table-sorting.js
Modified:
activemq/branches/activemq-5.3/activemq-web-console/src/main/webapp/decorators/main.jsp
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-web-console/src/main/webapp/decorators/main.jsp?rev=906418&r1=906417&r2=906418&view=diff
==============================================================================
---
activemq/branches/activemq-5.3/activemq-web-console/src/main/webapp/decorators/main.jsp
(original)
+++
activemq/branches/activemq-5.3/activemq-web-console/src/main/webapp/decorators/main.jsp
Thu Feb 4 09:39:17 2010
@@ -31,7 +31,7 @@
<script type='text/javascript' src='<c:url
value="/js/css.js"/>'></script>
<script type='text/javascript' src='<c:url
value="/js/standardista-table-sorting.js"/>'></script>
<script type='text/javascript' src='<c:url
value="/js/prettify.js"/>'></script>
- <script>addEvent(window, 'load', prettyPrint)</script>
+ <script>addEvent(window, 'load', function (event) { prettyPrint()
})</script>
</c:if>
<decorator:head />
Modified:
activemq/branches/activemq-5.3/activemq-web-console/src/main/webapp/js/standardista-table-sorting.js
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-web-console/src/main/webapp/js/standardista-table-sorting.js?rev=906418&r1=906417&r2=906418&view=diff
==============================================================================
---
activemq/branches/activemq-5.3/activemq-web-console/src/main/webapp/js/standardista-table-sorting.js
(original)
+++
activemq/branches/activemq-5.3/activemq-web-console/src/main/webapp/js/standardista-table-sorting.js
Thu Feb 4 09:39:17 2010
@@ -423,10 +423,12 @@
function standardistaTableSortingInit() {
standardistaTableSorting.init();
- var e = {};
- var obj = document.getElementsByTagName("TH")[0].firstChild; // 0 points
to the first column, use 3 if you want to sort on the 4th column
- e.target = obj;
- standardistaTableSorting.headingClicked(e); // will sort Ascending
+ if (document.getElementsByTagName("TH")[0] != null) {
+ var e = {};
+ var obj = document.getElementsByTagName("TH")[0].firstChild; //
0 points to the first column, use 3 if you want to sort on the 4th column
+ e.target = obj;
+ standardistaTableSorting.headingClicked(e); // will sort
Ascending
+ }
}
addEvent(window, 'load', standardistaTableSortingInit)
\ No newline at end of file
