From 9ec3324c29d1aacd7f3739077a2f3dd0c9df4fa2 Mon Sep 17 00:00:00 2001 From: Jeena Date: Sat, 7 Jun 2014 12:07:54 +0200 Subject: [PATCH] not removing canvas from DOM anymore, fixes #63 --- app/Game/Client/View/DomController.js | 13 +++---------- app/Game/Client/View/Views/AbstractView.js | 4 ++-- app/Game/Client/View/Views/PixiView.js | 2 +- static/html/game.html | 4 +++- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/app/Game/Client/View/DomController.js b/app/Game/Client/View/DomController.js index e087f50..1a854a4 100755 --- a/app/Game/Client/View/DomController.js +++ b/app/Game/Client/View/DomController.js @@ -8,7 +8,7 @@ define([ function (Settings, Nc, Stats, Screenfull) { function DomController() { - this.canvas = null; + this.canvas = document.getElementById("canvas"); this.debugCanvas = null; this.stats = null; this.ping = null; @@ -116,15 +116,8 @@ function (Settings, Nc, Stats, Screenfull) { return this.canvas; } - DomController.prototype.setCanvas = function (canvas) { - - var container = this.getCanvasContainer(); - if(this.canvas) { - container.removeChild(this.canvas); - } - - this.canvas = canvas; - container.appendChild(canvas); + DomController.prototype.initCanvas = function (canvas) { + Nc.trigger(Nc.ns.client.view.fullscreen.change, Screenfull.isFullscreen); } DomController.prototype.getDebugCanvas = function () { diff --git a/app/Game/Client/View/Views/AbstractView.js b/app/Game/Client/View/Views/AbstractView.js index e031c43..8afb1ba 100755 --- a/app/Game/Client/View/Views/AbstractView.js +++ b/app/Game/Client/View/Views/AbstractView.js @@ -40,10 +40,10 @@ function (DomController, Settings, Exception, Nc) { } } - AbstractView.prototype.setCanvas = function (canvas) { + AbstractView.prototype.initCanvas = function (canvas) { this.canvas = canvas; - DomController.setCanvas(canvas); + DomController.initCanvas(canvas); } AbstractView.prototype.loadPlayerMesh = function(player) { diff --git a/app/Game/Client/View/Views/PixiView.js b/app/Game/Client/View/Views/PixiView.js index 4cd8765..d35b18a 100755 --- a/app/Game/Client/View/Views/PixiView.js +++ b/app/Game/Client/View/Views/PixiView.js @@ -48,7 +48,7 @@ function (Parent, DomController, PIXI, Settings, Nc) { this.initInfo(); this.initLoader(); - this.setCanvas(this.renderer.view); + this.initCanvas(this.renderer.view); } PixiView.prototype.render = function () { diff --git a/static/html/game.html b/static/html/game.html index e043031..29ac5eb 100755 --- a/static/html/game.html +++ b/static/html/game.html @@ -55,7 +55,9 @@ -
+
+ +