mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2024-11-21 01:13:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #979 issue with edit time codes in sessions

Browse Source 
Improve about menu readability
Fix #1311 Tab can close while navigating UV
This commit is contained in:
JannisX11 2022-03-06 12:22:59 +01:00
parent a171e6fb88
commit 350b1d0bfa
6 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/dialogs.css
View File

@ -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 {

3
js/edit_sessions.js
View File

@ -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))
}

6
js/interface/about.js
View File

@ -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>

2
js/interface/start_screen.js
View File

@ -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);

3
js/io/formats/bbmodel.js
View File

@ -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);
})

15
js/io/project.js
View File

@ -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()
}
},