scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-06 04:42:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change the way associated PathStyles are created and updated.

Browse source
This commit is contained in:
Jürg Lehni 2011-05-16 19:21:36 +01:00
parent 05c0eb0e51
commit c4203fe174
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/item/Item.js
View file

@ -19,6 +19,7 @@ var Item = this.Item = Base.extend({
initialize: function() { initialize: function() {
paper.project.activeLayer.appendTop(this); paper.project.activeLayer.appendTop(this);
this._style = PathStyle.create(this);
this.setStyle(this._project.getCurrentStyle()); this.setStyle(this._project.getCurrentStyle());
}, },
@ -629,7 +630,7 @@ var Item = this.Item = Base.extend({
}, },
setStyle: function(style) { setStyle: function(style) {
this._style = PathStyle.create(this, style); this._style.initialize(style);
}, },
// TODO: toString // TODO: toString

6
src/item/PathStyle.js
View file

@ -44,13 +44,9 @@ var PathStyle = this.PathStyle = Base.extend(new function() {
}, },
statics: { statics: {
create: function(item, other) { create: function(item) {
var style = new PathStyle(PathStyle.dont); var style = new PathStyle(PathStyle.dont);
// We need _item to be set before calling initialize(), since
// it is setting bean properties that propagate changes through
// all of item's children.
style._item = item; style._item = item;
style.initialize(other);
return style; return style;
} }
} }

4
src/project/Project.js
View file

@ -33,7 +33,7 @@ var Project = this.Project = Base.extend({
this.activeView = canvas ? new ProjectView(canvas) : null; this.activeView = canvas ? new ProjectView(canvas) : null;
this._selectedItems = {}; this._selectedItems = {};
this._selectedItemCount = 0; this._selectedItemCount = 0;
this.setCurrentStyle(null); this._currentStyle = PathStyle.create(null);
}, },
getCurrentStyle: function() { getCurrentStyle: function() {
@ -41,7 +41,7 @@ var Project = this.Project = Base.extend({
}, },
setCurrentStyle: function(style) { setCurrentStyle: function(style) {
this._currentStyle = PathStyle.create(null, style); this._currentStyle.initialize(style);
}, },
activate: function() { activate: function() {