Skip to content
Permalink
Browse files

Umpleonline tab resize fix + tidbits

  • Loading branch information...
TimLethbridge committed May 7, 2019
1 parent 6749b71 commit cadaf83ae79760d11cd0d7025f7258ae0b764dea
@@ -11,7 +11,7 @@ cache:

- C:\Users\appveyor\.ant -> appveyor.yml
- C:\Users\appveyor\.ivy2 -> appveyor.yml
- C:\tools\php -> appveyor.yml
- C:\tools\php73 -> appveyor.yml
- C:\ProgramData\chocolatey\bin -> appveyor.yml
- C:\ProgramData\chocolatey\lib -> appveyor.yml

@@ -28,7 +28,7 @@ init:
- ps: choco install php --ignore-dependencies

install:

# NOTE if changing php version, make sure you change the cache above
- ps: $env:Path="C:\Ruby21\bin;C:/tools/ruby22/bin;C:\Program Files (x86)\Java\jdk1.8.0\bin;$($env:Path);C:\tools\php73;C:\tools\php;C:\ProgramData\chocolatey\lib\ant"

- ps: ant -version

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -743,7 +743,14 @@ function executeCommand($command, $rawcommand = null)
function execRun($command) {
set_time_limit(0);
passthru("( ulimit -t 10; " . $command . ")");
// the following prevents runaway server execution
// on Linux servers, but since Windows does not have
// a ulimit command, we bypass that for Windows
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
passthru($command);
} else {
passthru("(ulimit -t 10; " . $command . ")");
}
}
function serverRun($commandLine,$rawcommand=null) {
@@ -41,6 +41,13 @@
if($isSuccess) {
echo "<p>Successfully established connection to server\n";
echo "\n<p>php version:";
passthru("php -version");
echo "<p>Java version:";
passthru("java --version");
$numBytesSent= socket_write($theSocket, $commandLine);
if($numBytesSent === FALSE) {
echo "<p>Cound not send log command to server\n";
@@ -703,8 +703,9 @@ function LargeScreenManager()

this.calculateHeight = function()
{
var tabHeight = TabControl.isHidden() ? 0 : jQuery("#tabControl").outerHeight();
var newHeight = (jQuery(window).innerHeight() - jQuery("#header").outerHeight()
- jQuery("#topLine").outerHeight() - parseInt(jQuery("body").css('marginBottom'))
- jQuery("#topLine").outerHeight() - tabHeight - parseInt(jQuery("body").css('marginBottom'))
- parseInt(jQuery("body").css('marginTop')) - Layout.errorMessageSpace) * this.heightFactor;

if(newHeight < this.minCanvasSize.height)
@@ -960,8 +961,9 @@ function SmallScreenManager()

this.calculateHeight = function()
{
var tabHeight = TabControl.isHidden() ? 0 : jQuery("#tabControl").outerHeight();
var height = (jQuery(window).innerHeight() - jQuery("#header").outerHeight(true)
- 2*jQuery("#topLine").outerHeight(true) - Layout.errorMessageSpace)/2;
- 2*jQuery("#topLine").outerHeight(true) - tabHeight - Layout.errorMessageSpace)/2;

return height;
}
@@ -725,6 +725,7 @@ Page.createBookmark = function()
Page.toggleTabs = function()
{
TabControl.isHidden()? TabControl.showTabs() : TabControl.hideTabs();
Layout.layoutHandler.adjustAfterWindowResize();
}

Page.showDiagramSyncNeeded = function(doShow)

0 comments on commit cadaf83

Please sign in to comment.
You can’t perform that action at this time.