You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2016/05/02 15:29:37 UTC
[06/11] lucene-solr:branch_6x: SOLR-8918: Corrects usage of a global
variable in admin page's stream.js which was overriding the same variable in
cloud.js
SOLR-8918: Corrects usage of a global variable in admin page's stream.js which was overriding the same variable in cloud.js
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/499ae951
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/499ae951
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/499ae951
Branch: refs/heads/branch_6x
Commit: 499ae951ec4a5e35a9d067f2d3abf69e6734a08b
Parents: fc2200e
Author: Dennis Gove <dp...@gmail.com>
Authored: Tue Apr 19 13:49:26 2016 -0400
Committer: jbernste <jb...@apache.org>
Committed: Mon May 2 08:39:00 2016 -0400
----------------------------------------------------------------------
solr/webapp/web/css/angular/stream.css | 14 ++++++------
.../webapp/web/js/angular/controllers/stream.js | 23 +++++---------------
solr/webapp/web/partials/stream.html | 2 +-
3 files changed, 14 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/499ae951/solr/webapp/web/css/angular/stream.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/angular/stream.css b/solr/webapp/web/css/angular/stream.css
index c007425..0ebb592 100644
--- a/solr/webapp/web/css/angular/stream.css
+++ b/solr/webapp/web/css/angular/stream.css
@@ -184,20 +184,20 @@ limitations under the License.
top: 2px;
}
-#content #stream #result #explanation #graph-content
+#content #stream #result #explanation #explanation-content
{
min-height: 50px;
width: 100%
}
-#content #stream #result #explanation #graph-content .node circle
+#content #stream #result #explanation #explanation-content .node circle
{
color: #c48f00;
stroke: #c48f00;
fill: #c48f00;
}
-#content #stream #result #explanation #graph-content .link
+#content #stream #result #explanation #explanation-content .link
{
fill: none;
stroke: #e0e0e0;
@@ -205,28 +205,28 @@ limitations under the License.
}
#content #stream #result #explanation #legend .datastore circle,
-#content #stream #result #explanation #graph-content .node.datastore circle
+#content #stream #result #explanation #explanation-content .node.datastore circle
{
stroke: #3800c4;
fill: #3800c4;
}
#content #stream #result #explanation #legend .stream-source circle,
-#content #stream #result #explanation #graph-content .node.stream-source circle
+#content #stream #result #explanation #explanation-content .node.stream-source circle
{
stroke: #21a9ec;
fill: #21a9ec;
}
#content #stream #result #explanation #legend .stream-decorator circle,
-#content #stream #result #explanation #graph-content .node.stream-decorator circle
+#content #stream #result #explanation #explanation-content .node.stream-decorator circle
{
stroke: #cb21ec;
fill: #cb21ec;
}
#content #stream #result #explanation #legend .graph-source circle,
-#content #stream #result #explanation #graph-content .node.graph-source circle
+#content #stream #result #explanation #explanation-content .node.graph-source circle
{
stroke: #21eca9;
fill: #21eca9;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/499ae951/solr/webapp/web/js/angular/controllers/stream.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/controllers/stream.js b/solr/webapp/web/js/angular/controllers/stream.js
index f99f24f..7c3bcce 100644
--- a/solr/webapp/web/js/angular/controllers/stream.js
+++ b/solr/webapp/web/js/angular/controllers/stream.js
@@ -29,8 +29,6 @@ solrAdminApp.controller('StreamController',
$scope.doStream = function() {
- // alert("doing stream")
-
var params = {};
params.core = $routeParams.core;
params.handler = $scope.qt;
@@ -51,7 +49,7 @@ solrAdminApp.controller('StreamController',
if (undefined != jsonData["explanation"]) {
$scope.showExplanation = true;
- graphSubController($scope, jsonData["explanation"])
+ streamGraphSubController($scope, jsonData["explanation"])
delete jsonData["explanation"]
} else {
$scope.showExplanation = false;
@@ -76,18 +74,10 @@ solrAdminApp.controller('StreamController',
}
);
-
-var graphSubController = function($scope, explanation) {
+var streamGraphSubController = function($scope, explanation) {
$scope.showGraph = true;
$scope.pos = 0;
$scope.rows = 8;
- $scope.helperData = {
- protocol: [],
- host: [],
- hostname: [],
- port: [],
- pathname: []
- };
$scope.resetGraph = function() {
$scope.pos = 0;
@@ -134,7 +124,7 @@ var graphSubController = function($scope, explanation) {
$scope.showPaging = false;
$scope.isRadial = false;
- $scope.graphData = recurse(data, 1);
+ $scope.explanationData = recurse(data, 1);
$scope.depth = maxDepth + 1;
$scope.leafCount = leafCount;
@@ -143,17 +133,16 @@ var graphSubController = function($scope, explanation) {
$scope.initGraph(explanation);
};
-solrAdminApp.directive('foograph', function(Constants) {
+solrAdminApp.directive('explanationGraph', function(Constants) {
return {
restrict: 'EA',
scope: {
data: "=",
leafCount: "=",
- depth: "=",
- helperData: "=",
- isRadial: "="
+ depth: "="
},
link: function(scope, element, attrs) {
+
var helper_path_class = function(p) {
var classes = ['link'];
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/499ae951/solr/webapp/web/partials/stream.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/partials/stream.html b/solr/webapp/web/partials/stream.html
index f62007f..0d1154e 100644
--- a/solr/webapp/web/partials/stream.html
+++ b/solr/webapp/web/partials/stream.html
@@ -38,7 +38,7 @@ limitations under the License.
<div ng-show="showExplanation" id="explanation" class="clearfix">
<div id="frame">
- <div foograph id="graph-content" data="graphData" depth="depth" leaf-count="leafCount" helper-data="helperData" is-radial="false" class="content clearfix" ng-show="showGraph">
+ <div explanation-graph id="explanation-content" data="explanationData" depth="depth" leaf-count="leafCount" class="content clearfix" ng-show="showGraph">
<div id="legend">
<svg width="100%" height="15">
<g transform="translate(5,10)" class="stream-decorator"><circle r="4.5"></circle></g>