Skip to content

Commit

Permalink
v2.6.6
Browse files Browse the repository at this point in the history
  • Loading branch information
JannisX11 committed Apr 12, 2019
1 parent 8dd7ee0 commit 4079cca
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 16 deletions.
7 changes: 6 additions & 1 deletion css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -1785,9 +1785,11 @@
margin-top: -32px;
position: relative;
float: right;
pointer-events: none;
}
.panel .bar.next_to_title > .tool {
float: right;
pointer-events: initial;
}
#uv_size .ui-resizable-se:before,
#uv_size .ui-resizable-sw:before,
Expand Down Expand Up @@ -1836,9 +1838,11 @@
color: var(--color-text);
min-height: 81px;
max-height: 320px;
overflow-y: scroll;
padding: 5px;
font-size: 12pt;
overflow-y: scroll;
overflow-x: hidden;
word-break: break-word;
}
#chat_history li {
padding-top: 1px;
Expand All @@ -1863,6 +1867,7 @@
opacity: 0.6;
font-size: 0.8em;
float: right;
clear: both;
}
#chat_bar {
height: 32px;
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<script>
if (typeof module === 'object') {window.module = module; module = undefined;}//jQuery Fix
const isApp = typeof require !== 'undefined';
const appVersion = '2.6.5';
const appVersion = '2.6.6';
</script>
<script src="lib/vue.min.js"></script>
<script src="lib/vue_sortable.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<script>
if (typeof module === 'object') {window.module = module; module = undefined;}//jQuery Fix
const isApp = typeof require !== 'undefined';
const appVersion = '2.6.5';
const appVersion = '2.6.6';
</script>
<script src="lib/vue.min.js"></script>
<script src="lib/vue_sortable.js"></script>
Expand Down
12 changes: 6 additions & 6 deletions js/edit_sessions.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,16 @@ const EditSession = {
sendAll: function(type, data) {
var tag = {type, data}
Blockbench.dispatchEvent('send_session_data', tag)
for (var id in EditSession.clients) {
var client = EditSession.clients[id];
if (client != EditSession.self) {
client.send({
for (var key in EditSession.peer.connections) {
var conns = EditSession.peer.connections[key];
conns.forEach(conn => {
conn.send({
type: tag.type,
fromHost: EditSession.hosting,
sender: EditSession.peer.id,
data: tag.data
})
}
});
})
}
if (Blockbench.hasFlag('log_session')) {
console.log('Sent Data:', type, data)
Expand Down
2 changes: 1 addition & 1 deletion js/element.js
Original file line number Diff line number Diff line change
Expand Up @@ -1941,7 +1941,7 @@ function renameOutliner(element) {
} else if (selected.length === 1 && !EditSession.active) {
selected[0].rename()

} else if (selected.length) {
} else {

if (selected_group && !element) {
Blockbench.textPrompt(tl('message.rename_cubes'), selected_group.name, function (name) {
Expand Down
7 changes: 2 additions & 5 deletions js/web.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,11 @@ function saveFile() {
window.onbeforeunload = function() {
if (Prop.project_saved === false && elements.length > 0) {
return true;
} else {
EditSession.quit()
}
}
function showSaveDialog(close) {
function beforeClosing() {
EditSession.quit()
}
var unsaved_textures = 0;
textures.forEach(function(t) {
if (!t.saved) {
Expand All @@ -117,13 +116,11 @@ function showSaveDialog(close) {
if (close) {
//preventClosing = false
}
beforeClosing()
return true;
} else {
return false;
}
} else {
beforeClosing()
return true;
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Blockbench",
"description": "Minecraft Block Model Editor",
"version": "2.6.5",
"version": "2.6.6",
"license": "MIT",
"author": {
"name": "JannisX11",
Expand Down

0 comments on commit 4079cca

Please sign in to comment.