Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion resources/locales/en_US.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ shortcuts.category.toolbars.general=General Toolbar
shortcuts.category.tools=Tools
shortcuts.category.toolbar.top=Top Toolbar Shortcuts

modelview.pendingworldload=Opening schematic file
modelview.prompt.gotolayer=Go to layer / slice:

keynames.8=Backspace
Expand Down
5 changes: 1 addition & 4 deletions src/modelViews/ModelView_Canvas_Default.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@
'<span class="controls"></span>' +

'<div class="mouseDownCatcher innerDiv">' +
'<span class="pendingWorldLoad"><br/><br/><br/>'+this.gui.localization.getString("modelview.pendingworldload")+'...</span>' +
'<canvas class="modelView" id="'+this.elementId+'"></canvas>' +
'<canvas class="overlay" id="'+this.elementId_overlay+'"></canvas>' +
'</div>' +
Expand Down Expand Up @@ -170,7 +169,7 @@
this.$controls.parent().bind('mouseenter', {t: this}, function(e) {
e.data.t.$controls.show();
});

this.$controls.parent().bind('mouseleave', {t: this}, function(e) {
e.data.t.$controls.hide();
});
Expand Down Expand Up @@ -220,11 +219,9 @@

proto.setLoading = function(state) {
if (state) {
$('#'+this.containerDomId+' .pendingWorldLoad').show();
$('#'+this.containerDomId+' canvas').hide();
}
else {
$('#'+this.containerDomId+' .pendingWorldLoad').hide();
$('#'+this.containerDomId+' canvas').show();
this.setDimensions();
}
Expand Down