Repository: incubator-htrace Updated Branches: refs/heads/master 717957daf -> a0f64a3a0
HTRACE-205. htrace-web: Width of SearchResultsView should be uppdated along with resizing of browser window (iwasakims) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/a0f64a3a Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/a0f64a3a Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/a0f64a3a Branch: refs/heads/master Commit: a0f64a3a0f701fb00d7e24aaac5ba1046bf9d889 Parents: 717957d Author: Masatake Iwasaki <[email protected]> Authored: Fri Jul 10 16:53:27 2015 +0900 Committer: Masatake Iwasaki <[email protected]> Committed: Fri Jul 10 16:53:27 2015 +0900 ---------------------------------------------------------------------- htrace-webapp/src/main/web/app/search_results_view.js | 6 ------ htrace-webapp/src/main/web/app/search_view.js | 2 +- htrace-webapp/src/main/web/index.html | 13 ++++--------- 3 files changed, 5 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/a0f64a3a/htrace-webapp/src/main/web/app/search_results_view.js ---------------------------------------------------------------------- diff --git a/htrace-webapp/src/main/web/app/search_results_view.js b/htrace-webapp/src/main/web/app/search_results_view.js index 7a154dd..0a11eaa 100644 --- a/htrace-webapp/src/main/web/app/search_results_view.js +++ b/htrace-webapp/src/main/web/app/search_results_view.js @@ -142,13 +142,7 @@ htrace.SearchResultsView = Backbone.View.extend({ var ratio = this.computeScaleFactor(); //console.log("scaleCanvas: cssX=" + cssX + ", cssY=" + cssY + ", ratio=" + ratio); $('#searchView').css('height', this.canvasY + "px"); - $('#results').css('width', this.viewX + "px"); - $('#results').css('height', this.canvasY + "px"); - $('#resultsView').css('width', this.viewX + "px"); $('#resultsView').css('height', this.canvasY + "px"); - $('#resultsDiv').css('width', this.viewX + "px"); - $('#resultsDiv').css('height', this.canvasY + "px"); - $('#resultsCanvas').css('width', this.viewX + "px"); $('#resultsCanvas').css('height', this.canvasY + "px"); this.ctx.canvas.width = this.viewX * ratio; this.ctx.canvas.height = this.canvasY * ratio; http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/a0f64a3a/htrace-webapp/src/main/web/app/search_view.js ---------------------------------------------------------------------- diff --git a/htrace-webapp/src/main/web/app/search_view.js b/htrace-webapp/src/main/web/app/search_view.js index 270f11d..ffdba4c 100644 --- a/htrace-webapp/src/main/web/app/search_view.js +++ b/htrace-webapp/src/main/web/app/search_view.js @@ -26,7 +26,7 @@ htrace.SearchView = Backbone.View.extend({ this.searchResults = new htrace.SearchResults(); this.resultsView = new htrace.SearchResultsView({ searchResults: this.searchResults, - el: "#results" + el: "#resultsView" }); }, http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/a0f64a3a/htrace-webapp/src/main/web/index.html ---------------------------------------------------------------------- diff --git a/htrace-webapp/src/main/web/index.html b/htrace-webapp/src/main/web/index.html index 63956e4..fccbded 100644 --- a/htrace-webapp/src/main/web/index.html +++ b/htrace-webapp/src/main/web/index.html @@ -142,9 +142,6 @@ </div> </div> <div class="col-md-9" id="resultsView"> - <div id="results"> - <h3>...</h3> - </div> </div> </div> </script> @@ -161,12 +158,10 @@ </script> <script id="search-results-view-template" type="text/template"> - <div id="resultsDiv" class="htrace-canvas-container"> - <canvas id="resultsCanvas" class="htrace-canvas"> - <h2>Sorry, your browser does not support the HTML5 canvas element. Please - upgrade to a newer browser.</h2> - </canvas> - </div> + <canvas id="resultsCanvas" class="htrace-canvas"> + <h2>Sorry, your browser does not support the HTML5 canvas element. Please + upgrade to a newer browser.</h2> + </canvas> </script> <script id="modal-warning-template" type="text/template">
