lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-10-15 12:34:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

when a new stage is instantiated, it now clears the container DOM element

Browse Source
This commit is contained in:
Eric Rowell
2013-06-08 14:29:58 -07:00
parent 79c3124ed7
commit e8c9e7966f
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Stage.js
View File

@@ -24,6 +24,7 @@
SPACE = ' ', SPACE = ' ',
UNDERSCORE = '_', UNDERSCORE = '_',
CONTAINER = 'container', CONTAINER = 'container',
EMPTY_STRING = '',
EVENTS = [MOUSEDOWN, MOUSEMOVE, MOUSEUP, MOUSEOUT, TOUCHSTART, TOUCHMOVE, TOUCHEND], EVENTS = [MOUSEDOWN, MOUSEMOVE, MOUSEUP, MOUSEOUT, TOUCHSTART, TOUCHMOVE, TOUCHEND],
// cached variables // cached variables
@@ -554,12 +555,17 @@
}; };
}, },
_buildDOM: function() { _buildDOM: function() {
var container = this.getContainer();
// clear content inside container
container.innerHTML = EMPTY_STRING;
// content // content
this.content = document.createElement(DIV); this.content = document.createElement(DIV);
this.content.style.position = RELATIVE; this.content.style.position = RELATIVE;
this.content.style.display = INLINE_BLOCK; this.content.style.display = INLINE_BLOCK;
this.content.className = KINETICJS_CONTENT; this.content.className = KINETICJS_CONTENT;
this.attrs.container.appendChild(this.content); container.appendChild(this.content);
this.bufferCanvas = new Kinetic.SceneCanvas(); this.bufferCanvas = new Kinetic.SceneCanvas();
this.hitCanvas = new Kinetic.HitCanvas(); this.hitCanvas = new Kinetic.HitCanvas();

14
tests/js/unit/stageTests.js
View File

@@ -6,7 +6,6 @@ Test.Modules.STAGE = {
height: 200 height: 200
}); });
}, },
'instantiate stage with dom element': function(containerId) { 'instantiate stage with dom element': function(containerId) {
var containerDom = document.getElementById(containerId); var containerDom = document.getElementById(containerId);
var stage = new Kinetic.Stage({ var stage = new Kinetic.Stage({
@@ -15,6 +14,19 @@ Test.Modules.STAGE = {
height: 200 height: 200
}); });
}, },
'stage instantiation should clear container': function(containerId) {
var container = document.getElementById(containerId);
var dummy = document.createElement('p');
container.appendChild(dummy);
var stage = new Kinetic.Stage({
container: containerId,
width: 578,
height: 200
});
test(container.getElementsByTagName('p').length === 0, 'container should have no p tags');
},
'set stage size': function(containerId) { 'set stage size': function(containerId) {
var stage = new Kinetic.Stage({ var stage = new Kinetic.Stage({
container: containerId, container: containerId,