You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/10/07 21:26:53 UTC
[4/7] git commit: Merge branch 'STORM-439' of
github.com:Parth-Brahmbhatt/incubator-storm
Merge branch 'STORM-439' of github.com:Parth-Brahmbhatt/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dbd431f3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dbd431f3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dbd431f3
Branch: refs/heads/master
Commit: dbd431f35e660631afee5f82b15f980e4216c7fd
Parents: 1babd83 55231b2
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Oct 7 15:20:44 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Oct 7 15:20:44 2014 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 41 +--
storm-core/src/ui/public/component.html | 8 +-
storm-core/src/ui/public/js/purl.js | 267 -------------------
storm-core/src/ui/public/js/script.js | 3 +-
storm-core/src/ui/public/js/url.min.js | 1 +
storm-core/src/ui/public/js/visualization.js | 2 +-
.../templates/component-page-template.html | 6 +-
.../public/templates/index-page-template.html | 2 +-
.../templates/topology-page-template.html | 14 +-
storm-core/src/ui/public/topology.html | 8 +-
storm-dist/binary/LICENSE | 10 +-
11 files changed, 49 insertions(+), 313 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/dbd431f3/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
diff --cc storm-core/src/ui/public/topology.html
index 477d3b0,6940df4..a6598ef
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@@ -59,13 -59,11 +59,13 @@@
<script>
$(document).ajaxStop($.unblockUI);
$(document).ajaxStart(function(){
- $.blockUI({ message: '<img src="images/spinner.gif" /> <h3>Loading topology summary...</h3>'});
+ if ($("#topology-visualization").children().size() == 0) {
+ $.blockUI({ message: '<img src="images/spinner.gif" /> <h3>Loading topology summary...</h3>'});
+ }
});
$(document).ready(function() {
- var topologyId = $.url().param("id");
- var window = $.url().param("window");
+ var topologyId = $.url("?id");
+ var window = $.url("?window");
var sys = $.cookies.get("sys") || "false";
var url = "/api/v1/topology/"+topologyId+"?sys="+sys;
if(window) url += "&window="+window;