Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adding classes to boundary.js #2638

Merged
merged 6 commits into from
Dec 4, 2020
Merged

adding classes to boundary.js #2638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
72ea751
adding classes to boundary.js
kushal-khare-official Nov 28, 2020
3852e4a
adding classes to boundary.js
kushal-khare-official Dec 4, 2020
eced39a
converting onload to arrow function
kushal-khare-official Dec 4, 2020
6fbf4fc
semantic cleanup
kushal-khare-official Dec 4, 2020
226c76e
Semantic improvements
meganindya Dec 4, 2020
5c6fb89
Format code
meganindya Dec 4, 2020
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
9 changes: 3 additions & 6 deletions js/activity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4391,8 +4391,7 @@ function Activity() {
.setRefreshCanvas(refreshCanvas)
.init();

// Put the boundary in the turtles container so it scrolls
// with the blocks.
// Put the boundary in the turtles container so it scrolls with the blocks.
turtles = new Turtles();
turtles.masterStage = stage;
turtles.stage = turtleContainer;
Expand All @@ -4403,11 +4402,9 @@ function Activity() {
turtles.doGrid = _doCartesianPolar;
turtles.refreshCanvas = refreshCanvas;

// Put the boundary in the blocks container so it scrolls
// with the blocks.
// Put the boundary in the blocks container so it scrolls with the blocks.

boundary = new Boundary();
boundary.setStage(blocksContainer).init();
boundary = new Boundary(blocksContainer);

blocks = new Blocks(this);
blocks
Expand Down
73 changes: 29 additions & 44 deletions js/boundary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,32 @@
// trash and hidden. There is a menu button that can be used to
// restore trash.

function Boundary() {
this._stage = null;
this._container = null;

this.setStage = function(stage) {
this._stage = stage;
return this;
};

this.resizeEvent = function(scale) {};

this.init = function() {
class Boundary {
constructor(stage) {
this._container = new createjs.Container();
this._stage = stage;
this._stage.addChild(this._container);
this._stage.setChildIndex(this._container, 0);
};
}

this.setScale = function(w, h, scale) {
// resizeEvent(scale) {};

setScale(w, h, scale) {
this.destroy();
this.create(w, h, scale);
};
}

this.destroy = function() {
destroy() {
if (this._container.children.length > 0) {
this._container.removeChild(this._container.children[0]);
}
};
}

this.offScreen = function(x, y) {
return (
x < this.x ||
x > this.x + this.dx ||
y < this.y ||
y > this.y + this.dy
);
};
offScreen(x, y) {
return x < this.x || x > this.x + this.dx || y < this.y || y > this.y + this.dy;
}

this.create = function(w, h, scale) {
create(w, h, scale) {
this.w = w / scale;
this.x = 55 + 13;
this.dx = this.w - (110 + 26);
Expand All @@ -60,40 +48,37 @@ function Boundary() {
this.y = 55 + 13;
this.dy = this.h - (55 + 26);

that = this;

function __makeBoundary() {
const __makeBoundary = () => {
let img = new Image();
img.onload = function() {
img.onload = () => {
bitmap = new createjs.Bitmap(img);
that._container.addChild(bitmap);
this._container.addChild(bitmap);
};

img.src =
"data:image/svg+xml;base64," +
window.btoa(
unescape(
encodeURIComponent(
BOUNDARY.replace("HEIGHT", that.h)
.replace("WIDTH", that.w)
.replace("Y", that.y)
.replace("X", that.x)
.replace("DY", that.dy)
.replace("DX", that.dx)
BOUNDARY.replace("HEIGHT", this.h)
.replace("WIDTH", this.w)
.replace("Y", this.y)
.replace("X", this.x)
.replace("DY", this.dy)
.replace("DX", this.dx)
.replace("stroke_color", "#e08080")
)
)
);
}
};

__makeBoundary();
};
}

this.hide = function() {
hide() {
this._container.visible = false;
};
}

this.show = function() {
show() {
this._container.visible = true;
};
}
}