Prevent blocked UI if surface is on and you remove all surface methods

Also fixes an issue if the source viewer is open and the selection changes to no treenodes, the source viewer would force-hide, preventing the user from closing the source viewer properly, which cascaded to other UI issues.

Author: Lenny Halseth

codepulse/src/main/resources/toserve/pages/projects/SurfaceDetector.js

@@ -75,7 +75,7 @@
         }
 
         function toggleShowSurface() {
-            if (!$surfaceButton.hasClass('hasResults')) {
+            if (!$surfaceButton.hasClass('hasResults') && !isShowSurfaceOn()) {
                 return
             }
 

codepulse/src/main/webapp/projects.html

@@ -152,39 +152,38 @@ <h1 class="editable">
 			<div id="treemap-container">
 				<div class="widget-body">
 					<!-- Treemap goes here -->
-					<div id="source-popout">
-						<script type="text/x-handlebars-template" id="source-popout-header-template">
-							<h2>
-								Related Source
-								<a class="close">&times;</a>
-							</h2>
-
-							{{!-- FILE --}}
-							<div class="text-hardwrap">
-								<strong>File</strong> {{sourceFilePath}}
-							</div>
-							<div class="text-hardwrap">
-								<strong>Source</strong> {{sourceLabel}}
-							</div>
-							<div class="text-hardwrap">
-								<strong>Traced Source Locations</strong> {{tracedSourceLocationCount}} of {{sourceLocationCount}} {{tracedSourceLocationPercentage}}
-							</div>
-							<div class="text-hardwrap">
-								<i id="is-surface-method-button" data-node-id="{{nodeId}}" data-node-is-surface-method="false" class="im im-surface-off is-surface-method"></i>
-								<span class="is-surface-method-label">Surface Method</span>
-							</div>
-						</script>
-
-						<header></header>
-						<article>
-							<div class="codemirror-parent"></div>
-						</article>
-
-					</div>
 				</div>
 				<div class="no-selection-message">
 					Select packages from the list on the left to display them in more detail here
 				</div>
+				<div id="source-popout">
+					<script type="text/x-handlebars-template" id="source-popout-header-template">
+						<h2>
+							Related Source
+							<a class="close">&times;</a>
+						</h2>
+
+						{{!-- FILE --}}
+						<div class="text-hardwrap">
+							<strong>File</strong> {{sourceFilePath}}
+						</div>
+						<div class="text-hardwrap">
+							<strong>Source</strong> {{sourceLabel}}
+						</div>
+						<div class="text-hardwrap">
+							<strong>Traced Source Locations</strong> {{tracedSourceLocationCount}} of {{sourceLocationCount}} {{tracedSourceLocationPercentage}}
+						</div>
+						<div class="text-hardwrap">
+							<i id="is-surface-method-button" data-node-id="{{nodeId}}" data-node-is-surface-method="false" class="im im-surface-off is-surface-method"></i>
+							<span class="is-surface-method-label">Surface Method</span>
+						</div>
+					</script>
+
+					<header></header>
+					<article>
+						<div class="codemirror-parent"></div>
+					</article>
+				</div>
 			</div>
 		</div>