Skip to content

Commit

Permalink
few fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@maccman
maccman committed Apr 5, 2012
1 parent 8f27385 commit 1138447
Show file tree
Hide file tree
Showing 11 changed files with 83 additions and 59 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Expand Up @@ -40,7 +40,9 @@ Nice to have:
* Exporting HTML
* Share (dropbox/email?)
* Clone HTML components
* WebFonts
* Layers
* Context menu

Inherit Ellipsis from Rectangle (resizing & lines).

Expand Down
16 changes: 8 additions & 8 deletions assets/javascripts/app/controllers/stage.module.coffee
View file
Expand Up @@ -96,23 +96,23 @@ class Stage extends Spine.Controller
# ZIndex

bringForward: ->
for element in @selection.elements
@zindex.bringForward(element)
elements = @selection.elements.slice(0).reverse()
@zindex.bringForward(element) for element in elements
true

bringBack: ->
for element in @selection.elements
@zindex.bringBack(element)
elements = @selection.elements.slice(0).reverse()
@zindex.bringBack(element) for element in elements
true

bringToFront: ->
for element in @selection.elements
@zindex.bringToFront(element)
elements = @selection.elements.slice(0).reverse()
@zindex.bringToFront(element) for element in elements
true

bringToBack: ->
for element in @selection.elements
@zindex.bringToBack(element)
elements = @selection.elements.slice(0).reverse()
@zindex.bringToBack(element) for element in elements
true

# Attributes
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/app/controllers/stage/zindex.module.coffee
View file
Expand Up @@ -7,7 +7,7 @@ class ZIndex
bringForward: (element) ->
index = @order.indexOf(element)

if index isnt -1
if index isnt -1 or index isnt (@order.length - 1)
# Swap item forwards
@order[index] = @order[index + 1]
@order[index + 1] = element
Expand Down
16 changes: 12 additions & 4 deletions assets/javascripts/app/models/undo.module.coffee
View file
Expand Up @@ -8,13 +8,21 @@ class Undo
redo()

@undo: ->
[undo, redo] = @undoStack.pop()
action = @undoStack.pop()
return unless action

[undo, redo] = action
undo()
@redoStack.push([undo, redo])

@redoStack.push(action)

@redo: ->
[undo, redo] = @redoStack.pop()
action = @redoStack.pop()
return unless action

[undo, redo] = action
redo()
@undoStack.push([undo, redo])

@undoStack.push(action)

module.exports = Undo
1 change: 1 addition & 0 deletions assets/stylesheets/app/popup.css.styl
View file
Expand Up @@ -10,6 +10,7 @@
background: #FFF
min-width: 400px
color: #000
z-index: 10000

article {
padding: 5px
Expand Down
2 changes: 2 additions & 0 deletions assets/stylesheets/app/stage.css.styl
View file
Expand Up @@ -91,6 +91,7 @@
.snapLine {
background: #FBFF40
position: absolute
z-index: 9999

&.vertical {
width: 1px
Expand All @@ -107,5 +108,6 @@
padding: 3px
background: rgba(255, 249, 215, 0.85)
box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.3)
z-index: 10001
}
}
32 changes: 16 additions & 16 deletions public/assets/app/controllers/stage.module.js
View file
Expand Up @@ -208,40 +208,40 @@ this.require.define({"app/controllers/stage":function(exports, require, module){
};

Stage.prototype.bringForward = function() {
var element, _i, _len, _ref;
_ref = this.selection.elements;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
element = _ref[_i];
var element, elements, _i, _len;
elements = this.selection.elements.slice(0).reverse();
for (_i = 0, _len = elements.length; _i < _len; _i++) {
element = elements[_i];
this.zindex.bringForward(element);
}
return true;
};

Stage.prototype.bringBack = function() {
var element, _i, _len, _ref;
_ref = this.selection.elements;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
element = _ref[_i];
var element, elements, _i, _len;
elements = this.selection.elements.slice(0).reverse();
for (_i = 0, _len = elements.length; _i < _len; _i++) {
element = elements[_i];
this.zindex.bringBack(element);
}
return true;
};

Stage.prototype.bringToFront = function() {
var element, _i, _len, _ref;
_ref = this.selection.elements;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
element = _ref[_i];
var element, elements, _i, _len;
elements = this.selection.elements.slice(0).reverse();
for (_i = 0, _len = elements.length; _i < _len; _i++) {
element = elements[_i];
this.zindex.bringToFront(element);
}
return true;
};

Stage.prototype.bringToBack = function() {
var element, _i, _len, _ref;
_ref = this.selection.elements;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
element = _ref[_i];
var element, elements, _i, _len;
elements = this.selection.elements.slice(0).reverse();
for (_i = 0, _len = elements.length; _i < _len; _i++) {
element = elements[_i];
this.zindex.bringToBack(element);
}
return true;
Expand Down
2 changes: 1 addition & 1 deletion public/assets/app/controllers/stage/zindex.module.js
View file
Expand Up @@ -73,7 +73,7 @@ this.require.define({"app/controllers/stage/zindex":function(exports, require, m
ZIndex.prototype.bringForward = function(element) {
var index;
index = this.order.indexOf(element);
if (index !== -1) {
if (index !== -1 || index !== (this.order.length - 1)) {
this.order[index] = this.order[index + 1];
this.order[index + 1] = element;
}
Expand Down
16 changes: 10 additions & 6 deletions public/assets/app/models/undo.module.js
View file
Expand Up @@ -76,17 +76,21 @@ this.require.define({"app/models/undo":function(exports, require, module){(funct
};

Undo.undo = function() {
var redo, undo, _ref;
_ref = this.undoStack.pop(), undo = _ref[0], redo = _ref[1];
var action, redo, undo;
action = this.undoStack.pop();
if (!action) return;
undo = action[0], redo = action[1];
undo();
return this.redoStack.push([undo, redo]);
return this.redoStack.push(action);
};

Undo.redo = function() {
var redo, undo, _ref;
_ref = this.redoStack.pop(), undo = _ref[0], redo = _ref[1];
var action, redo, undo;
action = this.redoStack.pop();
if (!action) return;
undo = action[0], redo = action[1];
redo();
return this.undoStack.push([undo, redo]);
return this.undoStack.push(action);
};

return Undo;
Expand Down
3 changes: 3 additions & 0 deletions public/assets/application.css
View file
Expand Up @@ -546,6 +546,7 @@ body {
background: #fff;
min-width: 400px;
color: #000;
z-index: 10000;
}
.popup article {
padding: 5px;
Expand Down Expand Up @@ -667,6 +668,7 @@ body {
#app .stage .snapLine {
background: #fbff40;
position: absolute;
z-index: 9999;
}
#app .stage .snapLine.vertical {
width: 1px;
Expand All @@ -683,6 +685,7 @@ body {
-moz-box-shadow: 1px 1px 3px rgba(0,0,0,0.30);
-webkit-box-shadow: 1px 1px 3px rgba(0,0,0,0.30);
box-shadow: 1px 1px 3px rgba(0,0,0,0.30);
z-index: 10001;
}
/*
Expand Down
50 changes: 27 additions & 23 deletions public/assets/application.js
View file
Expand Up @@ -13619,40 +13619,40 @@ this.require.define({"app/controllers/stage":function(exports, require, module){
};

Stage.prototype.bringForward = function() {
var element, _i, _len, _ref;
_ref = this.selection.elements;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
element = _ref[_i];
var element, elements, _i, _len;
elements = this.selection.elements.slice(0).reverse();
for (_i = 0, _len = elements.length; _i < _len; _i++) {
element = elements[_i];
this.zindex.bringForward(element);
}
return true;
};

Stage.prototype.bringBack = function() {
var element, _i, _len, _ref;
_ref = this.selection.elements;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
element = _ref[_i];
var element, elements, _i, _len;
elements = this.selection.elements.slice(0).reverse();
for (_i = 0, _len = elements.length; _i < _len; _i++) {
element = elements[_i];
this.zindex.bringBack(element);
}
return true;
};

Stage.prototype.bringToFront = function() {
var element, _i, _len, _ref;
_ref = this.selection.elements;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
element = _ref[_i];
var element, elements, _i, _len;
elements = this.selection.elements.slice(0).reverse();
for (_i = 0, _len = elements.length; _i < _len; _i++) {
element = elements[_i];
this.zindex.bringToFront(element);
}
return true;
};

Stage.prototype.bringToBack = function() {
var element, _i, _len, _ref;
_ref = this.selection.elements;
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
element = _ref[_i];
var element, elements, _i, _len;
elements = this.selection.elements.slice(0).reverse();
for (_i = 0, _len = elements.length; _i < _len; _i++) {
element = elements[_i];
this.zindex.bringToBack(element);
}
return true;
Expand Down Expand Up @@ -14406,7 +14406,7 @@ this.require.define({"app/controllers/stage/zindex":function(exports, require, m
ZIndex.prototype.bringForward = function(element) {
var index;
index = this.order.indexOf(element);
if (index !== -1) {
if (index !== -1 || index !== (this.order.length - 1)) {
this.order[index] = this.order[index + 1];
this.order[index + 1] = element;
}
Expand Down Expand Up @@ -14763,17 +14763,21 @@ this.require.define({"app/models/undo":function(exports, require, module){(funct
};

Undo.undo = function() {
var redo, undo, _ref;
_ref = this.undoStack.pop(), undo = _ref[0], redo = _ref[1];
var action, redo, undo;
action = this.undoStack.pop();
if (!action) return;
undo = action[0], redo = action[1];
undo();
return this.redoStack.push([undo, redo]);
return this.redoStack.push(action);
};

Undo.redo = function() {
var redo, undo, _ref;
_ref = this.redoStack.pop(), undo = _ref[0], redo = _ref[1];
var action, redo, undo;
action = this.redoStack.pop();
if (!action) return;
undo = action[0], redo = action[1];
redo();
return this.undoStack.push([undo, redo]);
return this.undoStack.push(action);
};

return Undo;
Expand Down

0 comments on commit 1138447

Please sign in to comment.