Fix #979 issue with edit time codes in sessions

Improve about menu readability Fix #1311 Tab can close while navigating UV
JannisX11 · Mar 6, 2022 · 350b1d0 · 350b1d0
1 parent a171e6f
commit 350b1d0
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/css/dialogs.css b/css/dialogs.css
@@ -758,6 +758,10 @@
 	dialog#about .multi_column_list {
 		column-count: 3;
 	}
+	.special_thanks_mentions li {
+		line-height: 18px;
+    	margin-bottom: 8px;
+	}
 
 /*Specific Dialogs*/
 	.dialog#texture_edit p.multiline_text {

diff --git a/js/edit_sessions.js b/js/edit_sessions.js
@@ -210,7 +210,8 @@ class EditSession {
 			before: omitKeys(entry.before, ['aspects']),
 			post: omitKeys(entry.post, ['aspects']),
 			save_history: entry.save_history,
-			action: entry.action
+			action: entry.action,
+			time: entry.time || Date.now()
 		}
 		this.sendAll('edit', JSON.stringify(new_entry))
 	}

diff --git a/js/interface/about.js b/js/interface/about.js
@@ -75,13 +75,13 @@ BARS.defineActions(() => {
 
 							<p>Created by Jannis Petersen</p>
 							<p style="color: var(--color-subtle_text);">A free and open-source low-poly model editor. To make 3D art easy and accessible for everyone.
-								For all who enjoy stylied 3D art. For game developers, students, content creators, and for the Minecraft community.</p>
+								For all who enjoy stylized 3D art. For game developers, students, content creators, and for the Minecraft community.</p>
 
 							<h4>SPECIAL THANKS TO</h4>
-							<ul class="multi_column_list">
+							<ul class="multi_column_list special_thanks_mentions">
 								<li>Mojang Studios</li>
-								<li>The community moderators</li>
 								<li>All contributors</li>
+								<li>The community moderators</li>
 								<li>All donators</li>
 								<li>All translators</li>
 								<li>Wacky</li>

diff --git a/js/interface/start_screen.js b/js/interface/start_screen.js
@@ -326,7 +326,7 @@ onVueSetup(function() {
 		}
 
 		// Quick Setup
-		if (Blockbench.startup_count <= 1 || true) {
+		if (Blockbench.startup_count <= 1) {
 
 			let section = Interface.createElement('section', {id: 'quick_setup'});
 			$('#start_screen content').prepend(section);

diff --git a/js/io/formats/bbmodel.js b/js/io/formats/bbmodel.js
@@ -185,7 +185,8 @@ var codec = new Codec('project', {
 				var e = {
 					before: omitKeys(h.before, ['aspects']),
 					post: omitKeys(h.post, ['aspects']),
-					action: h.action
+					action: h.action,
+					time: h.time
 				}
 				model.history.push(e);
 			})

diff --git a/js/io/project.js b/js/io/project.js
@@ -559,7 +559,17 @@ onVueSetup(() => {
 					this.thumbnail.remove();
 					delete this.thumbnail;
 				}
-				if (e1.button == 1) return;
+				if (e1.button == 1) {
+					function off(e2) {
+						removeEventListeners(document, 'mouseup', off);
+						delete tab.middle_mouse_pressing;
+						console.log('delete')
+					}
+					tab.middle_mouse_pressing = true;
+					console.log('on')
+					addEventListeners(document, 'mouseup', off, {passive: false});
+					return;
+				}
 
 				let scope = this;
 				let active = false;
@@ -640,7 +650,8 @@ onVueSetup(() => {
 				}
 			},
 			mouseUp(tab, e1) {
-				if (e1.button === 1) {
+				console.log(e1.button === 1, tab.middle_mouse_pressing)
+				if (e1.button === 1 && tab.middle_mouse_pressing) {
 					tab.close()
 				}
 			},