Skip to content

Commit

Permalink
GEODE-303: fix dataBrowser javascript errors using a splitter with fr…
Browse files Browse the repository at this point in the history
…ee license.
  • Loading branch information
jinmeiliao committed Feb 17, 2016
1 parent ef94416 commit 23edf7e
Show file tree
Hide file tree
Showing 8 changed files with 433 additions and 17 deletions.
6 changes: 6 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -359,3 +359,9 @@ jquery.sparkline.js (http://omnipotent.net/jquery.sparkline/)
---------------------------------------------------------------------------
This product bundles jquery.sparkline which is available under a BSD-like license.
For details see http://opensource.org/licenses/BSD-3-Clause.

---------------------------------------------------------------------------
split.js (https://github.com/nathancahill/Split.js)
---------------------------------------------------------------------------
This product bundles split.js which is available under an MIT license.
For details see http://www.opensource.org/licenses/mit-license.php.
5 changes: 5 additions & 0 deletions gemfire-assembly/src/main/dist/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -427,3 +427,8 @@ jquery.sparkline.js (http://omnipotent.net/jquery.sparkline/)
This product bundles jquery.sparkline which is available under a BSD-like license.
For details see http://opensource.org/licenses/BSD-3-Clause.

---------------------------------------------------------------------------
split.js (https://github.com/nathancahill/Split.js)
---------------------------------------------------------------------------
This product bundles split.js which is available under an MIT license.
For details see http://www.opensource.org/licenses/mit-license.php.
17 changes: 5 additions & 12 deletions gemfire-pulse/src/main/webapp/DataBrowser.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
<script type="text/javascript" src='scripts/lib/common.js'></script>

<!--Splitter-->
<script src="scripts/lib/jquery.splitter-0.5.js"></script>
<link href="css/jquery.splitter.css" rel="stylesheet" />
<script src="scripts/lib/split.js"></script>

<!--Custom Scroll Bar-->
<!-- styles needed by jScrollPane - include in your own sites -->
Expand All @@ -74,8 +73,6 @@

<!-- popups-->
<link href="css/popup.css" rel="stylesheet" type="text/css" />
<!-- Customize checkbox & radiobutton -->
<script type="text/javascript" src="scripts/lib/checkBox-RadioButton.js"></script>
<!-- Treeview JSON -->
<script type="text/javascript" src="scripts/lib/jquery.ztree.core-3.5.js"></script>
<script type="text/javascript" src="scripts/lib/jquery.ztree.excheck-3.5.js"></script>
Expand Down Expand Up @@ -199,12 +196,10 @@
<!--Middle Block 1-->
<div class="left leftBlockCanvas">
<!-- Splitter Master-->
<div class="splitterMaster">
<div class="splitterInnerBlock">
<div id="widget">
<!-- Left splitter-->
<div id="leftBlock">
<div class="leftTopSplitterSpacing">
<div id="leftBlock" class="split split-horizontal">
<div id="dataRegion" class="split split-vertical">
<div class="rightInnerBlocks">
<a class="active" href="#.">Data Regions</a>
</div>
Expand Down Expand Up @@ -240,7 +235,7 @@
</div>
</div>
<!-- Members List Block-->
<div class="">
<div id="regionMember" class="split split-vertical">
<div class="rightInnerBlocks btm_pnl">
<a href="#." class="active">Region Members</a>
</div>
Expand All @@ -254,7 +249,7 @@
</div>
</div>
<!--Right splitter -->
<div id="rightBlock">
<div id="rightBlock" class="split split-horizontal">
<!-- Tab links-->
<div class="rightInnerBlocks ">
<a href="#." class="active">Queries</a>
Expand Down Expand Up @@ -303,8 +298,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!--Popups Block-->
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 33 additions & 1 deletion gemfire-pulse/src/main/webapp/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3060,8 +3060,40 @@ input[type="text"].searchBoxRegion {
background: url(../images/ui-anim_basic_16x16.gif) no-repeat center center;
display: none;
}
/* loading symbol */

/* For Data Browser */
#loaderSymbolWrapper .loader{
top: 6px;
}
/* loading symbol */

.split {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
overflow-y: auto;
overflow-x: hidden;
}

.gutter {
background-color: #0f1c25;

background-repeat: no-repeat;
background-position: 50%;
}

.gutter.gutter-horizontal {
background-image: url('grips/vertical.png');
cursor: ew-resize;
}

.gutter.gutter-vertical {
background-image: url('grips/horizontal.png');
cursor: ns-resize;
}

.split.split-horizontal, .gutter.gutter-horizontal {
height: 100%;
float: left;
}
/* End For Data Browser */
Loading

0 comments on commit 23edf7e

Please sign in to comment.