Version 17:

* Fixed script error when exporting a clip from the alerts tab. * Playback controls will no longer fade out while export controls are active.
bp2008 · May 20, 2018 · cd288f5 · cd288f5
1 parent abd67af
commit cd288f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/ui3.htm b/ui3.htm
@@ -34,7 +34,7 @@
 		};
 	</script>
 	<script type="text/javascript">
-		var ui_version = "16";
+		var ui_version = "17";
 		var bi_version = "%%VERSION%%";
 		var combined_version = ui_version + "-" + bi_version;
 		//if (!!navigator.userAgent.match(/ Android /))

diff --git a/ui3/ui3.js b/ui3/ui3.js
@@ -3871,7 +3871,7 @@ function PlaybackControls()
 		if (isVisible)
 		{
 			CloseSettings();
-			if (self.IsSeekbarDragging())
+			if (self.IsSeekbarDragging() || exportControls.IsEnabled())
 				return;
 			$pc.stop(true, true);
 			$pc.fadeOut(100);
@@ -4679,7 +4679,7 @@ function ExportControls()
 		exportOffsetStart.resized();
 		exportOffsetEnd.resized();
 
-		var labelFontSize = Clamp(w * 0.04, 12, 18);
+		var labelFontSize = Clamp(w * 0.04, 11, 18);
 		$exportControlsStatus.css('font-size', labelFontSize + 'px');
 		$exportControlsStatus.css('line-height', labelFontSize + 'px');
 
@@ -4689,6 +4689,10 @@ function ExportControls()
 	{
 		return exportOffsetStart.IsDragging() || exportOffsetEnd.IsDragging();
 	}
+	this.IsEnabled = function ()
+	{
+		return controlsEnabled;
+	}
 	this.mouseMove = function (e)
 	{
 		var r1 = exportOffsetStart.mouseMove(e);
@@ -4758,7 +4762,7 @@ function ExportControls()
 		if ((clipData.flags & alert_flag_offsetMs) !== 0)
 		{
 			startTime = clipData.offsetMs / fileDuration;
-			endTime = (startTimeMs + clipData.roughLengthMs) / fileDuration;
+			endTime = (clipData.offsetMs + clipData.roughLengthMs) / fileDuration;
 		}
 
 		exportOffsetStart.setClipData(clipData);
@@ -4771,7 +4775,7 @@ function ExportControls()
 		$exportControlsExportBtn.removeAttr('disabled');
 
 		var $selectOffsetsMessage = $('<div class="exportOffsetMessage">Choose offsets by dragging the handles</div>');
-		var labelFontSize = Clamp($layoutBottom.width() * 0.04, 12, 18);
+		var labelFontSize = Clamp($layoutBottom.width() * 0.04, 9, 18);
 		$selectOffsetsMessage.css('font-size', labelFontSize + 'px');
 		$selectOffsetsMessage.fadeIn(function ()
 		{