Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:47:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix tablet not opening.

Browse source 
Fix headers not showing correctly since changes in editProperties page.
This commit is contained in:
Artur Gomes 2017-08-16 20:59:09 +01:00
parent 9d87954d71
commit 030877457b
2 changed files with 236 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/defaultScripts.js
View file

@ -32,7 +32,6 @@ var DEFAULT_SCRIPTS_COMBINED = [
]; ];
var DEFAULT_SCRIPTS_SEPARATE = [ var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js", "system/controllers/controllerScripts.js",
"system/fingerPaint/fingerPaint.js"
// "system/chat.js" // "system/chat.js"
"system/fingerPaint/fingerPaint.js" "system/fingerPaint/fingerPaint.js"
]; ];

35
scripts/system/fingerPaint/html/brushesTab.html
View file

@ -1,8 +1,8 @@
<script type="text/javascript" src="../../html/js/keyboardControl.js"></script> <script type="text/javascript" src="../../html/js/keyboardControl.js"></script>
<script src="../../html/js/jquery-2.1.4.min.js"></script> <script src="../../html/js/jquery-2.1.4.min.js"></script>
<script src="../content/js/ColorUtils.js"></script> <script src="../content/js/ColorUtils.js"></script>
<script src="../content/js/ColorUtils.js"></script>
<script src="../../html/js/colpick.js"></script> <script src="../../html/js/colpick.js"></script>
<style> <style>
input[type=range] { input[type=range] {
-webkit-appearance: none; -webkit-appearance: none;
@ -76,6 +76,7 @@
} }
#brushesCointainer { #brushesCointainer {
margin-bottom: 50px; margin-bottom: 50px;
margin-top: 24px;
} }
.imageContainer { .imageContainer {
display: block; display: block;
@ -136,7 +137,7 @@
margin-top: 4px; margin-top: 4px;
} }
#continuousLine { #continuousLineIcon {
text-align: center; text-align: center;
background-color: transparent; background-color: transparent;
color: white; color: white;
@ -160,16 +161,15 @@
</div> </div>
</div> </div>
<div id="brushesContent"> <div id="brushesContent">
<div class="section-header"></div> <div id="properties-list">
<fieldset class="major">
<div id="special-section" class="section-header special-group special-section"> <legend id="special-section" class="section-header special-group special-section">
<label>Special Effects</label><span>M</span> Special Effects<span>M</span>
</div> </legend>
<div class="special-group special-brushes-section special-section"> <div class="special-group special-brushes-section special-section">
<div class="special-group special-brushes property checkbox"> <div class="special-group special-brushes property checkbox">
<span class="glyph effectPreview" id="continuousLine">&#8734;</span> <span id="continuousLineIcon" class="glyph effectPreview">&#8734;</span>
<input onchange="setContinuosLineMode(this)" type="checkbox" id="continuousLine"></input> <input onchange="setContinuosLineMode(this)" type="checkbox" id="continuousLine"></input>
<label for="continuousLine">Use Continuous Line</label> <label for="continuousLine">Use Continuous Line</label>
</div> </div>
@ -198,10 +198,13 @@
<label for="dynamicValue">Use Dynamic Brightness</label> <label for="dynamicValue">Use Dynamic Brightness</label>
</div> </div>
</div> </div>
</fieldset>
<div id="brushes-section" style="margin-bottom: 24px" class="section-header brushes-group">
<label>Brushes</label><span>M</span> <fieldset class="major">
</div> <legend id="brush-section" class="section-header brushes-group brushes-section">
Brushes<span>M</span>
</legend>
<div id="brushesCointainer" class="brushes-group"> <div id="brushesCointainer" class="brushes-group">
<button class="brushButton" brushType="stretch" id="content/brushes/square.png" onclick="changePaintBrush(0)"> <button class="brushButton" brushType="stretch" id="content/brushes/square.png" onclick="changePaintBrush(0)">
<div class="imageContainer"> <div class="imageContainer">
@ -391,6 +394,8 @@
</div> </div>
<div class="brushLabel">Softbow</div> <div class="brushLabel">Softbow</div>
</button> </button>
</fieldset>
</div>
</div> </div>
</div> </div>
@ -635,20 +640,18 @@
$(window).load(function(){ $(window).load(function(){
setUpKeyboardControl(); setUpKeyboardControl();
// Collapsible sections // Collapsible sections
var elCollapsible = document.getElementsByClassName("section-header"); var elCollapsible = document.getElementsByClassName("section-header");
var toggleCollapsedEvent = function(event) { var toggleCollapsedEvent = function(event) {
var element = event.target; var element = event.target;
if (element.nodeName !== "DIV") {
element = element.parentNode;
}
var isCollapsed = element.getAttribute("collapsed") !== "true"; var isCollapsed = element.getAttribute("collapsed") !== "true";
element.setAttribute("collapsed", isCollapsed ? "true" : "false"); element.setAttribute("collapsed", isCollapsed ? "true" : "false");
element.getElementsByTagName("span")[0].textContent = isCollapsed ? "L" : "M"; element.getElementsByTagName("span")[0].textContent = isCollapsed ? "L" : "M";
var switchCollapsedState = { var switchCollapsedState = {
"type" : "switchCollapsed", "type" : "switchCollapsed",
"isCollapsed" : isCollapsed, "isCollapsed": isCollapsed,
"sectionId" : element.getAttribute("id") "sectionId" : element.getAttribute("id")
}; };
EventBridge.emitWebEvent(JSON.stringify(switchCollapsedState)); EventBridge.emitWebEvent(JSON.stringify(switchCollapsedState));