@@ -14,6 +14,7 @@
<button id="trashSelected">Remove Question</button>
<button id="trashAll">Remove All</button>
<button id="undo">Undo</button>
+ <button id="redo">Redo</button>
</div>
<div id="ballot"></div>
Poll Authoring Tool/Resources/ballot-editor.html
@@ -1,6 +1,6 @@
// represents a ballot view, containing questions
var BallotEditor = new Class({
- sort: null, selected: null, history: [],
+ sort: null, selected: null, history: [], future: [],
initialize: function(view) {
this.view = $(view);
@@ -48,16 +48,27 @@ var BallotEditor = new Class({
thing.dispose();
},
- addHistory: function(data) {
- if (this.history.length > 150) this.history.shift();
+ addHistoryWithFuture: function(data) {
+ while(this.history.length > 150) { this.history.shift(); }
this.history.push(data || this.serialize());
},
+ addHistory: function(data) {
+ this.addHistoryWithFuture(data);
+ this.future = [];
+ },
+
revert: function() {
- this.history.pop();
+ this.future.unshift(this.history.pop());
var last = this.history.getLast();
if (last) this.loadWithoutHistory(last);
- }
+ },
+
+ antirevert: function() {
+ var revived = this.future.shift();
+ this.loadWithoutHistory(revived);
+ this.addHistoryWithFuture(revived);
+ },
});
@@ -140,7 +151,7 @@ BallotEditor.Question = new Class({
serialize: function() {
return {
'message': this.elements.message.get('value'),
- 'type': this.elements.pollType.get('value'),
+ 'type': this.elements.pollType.get('value').toLowerCase(),
'options': this.elements.answers.getChildren().map(function(child) {
return child.get('value').trim();
}).filter(function(answer) { return answer.length > 0; })
@@ -167,6 +178,7 @@ window.addEvent('load', function() {
var updateUndo = function() {
undo.disabled = (editor.history.length < 2);
+ redo.disabled = (editor.future.length < 1);
}
var saveWithoutHistory = function() {
@@ -186,6 +198,7 @@ window.addEvent('load', function() {
editor.add(new BallotEditor.Question(editor,
{"message": 'New Question', "type": 'plurality', "options": []}
), 'top');
+ editor.view.getElement('.message').focus();
save();
}
@@ -205,8 +218,44 @@ window.addEvent('load', function() {
updateUndo();
}
+ redo.onclick = function() {
+ editor.antirevert();
+ saveWithoutHistory();
+ updateUndo();
+ }
+
updateUndo();
document.body.addEvent('unload', save);
document.body.addEvent('change', save);
+
+ //window.addEvent('keyup', function(evt) {
+ // document.title = evt.key;
+ //});
+
+ // Keyboard based control
+ var keyAccess = new Keyboard({
+ eventType: 'keyup',
+ active: true,
+ events: {
+ 'ctrl+z': undo.onclick(),
+ 'ctrl+shift+z': redo.onclick(),
+ 'up': function (evt) {
+ var list = $$('input'), thing = list[list.indexOf($(evt.target)) - 1];
+ if (thing) thing.focus();
+ },
+ 'down': function(evt) {
+ var list = $$('input'), thing = list[list.indexOf($(evt.target)) + 1];
+ if (thing) thing.focus();
+ },
+ 'left': function(evt) {
+ if (evt.target.hasClass('type'))
+ evt.target.getPrevious('.message').focus();
+ },
+ 'right': function(evt) {
+ if (evt.target.hasClass('message'))
+ evt.target.getNext('.type').focus();
+ }
+ }
+ });
});
\ No newline at end of file
Poll Authoring Tool/Resources/script/ballot-editor.js
@@ -137,7 +137,7 @@ textarea {
left: 0;
right: 0;
bottom: 0;
- overflow: auto;
+ overflow-y: scroll;
}
#ballot .question {
@@ -148,7 +148,7 @@ textarea {
#ballot .question .bar {
margin: 10px 10px 0 10px;
- padding: 5px;
+ padding: 5px 0 5px 5px;
background-color: #666666;
-webkit-user-select: none;
-webkit-border-radius: 5px;
@@ -156,7 +156,8 @@ textarea {
#ballot .question .bar * { vertical-align: middle; }
#ballot .question .bar .handle { cursor: default; padding: 0 10px 0 5px; }
-#ballot .question .bar .message { width: 299px; margin-right: 5px; }
+#ballot .question .bar .message { width: 300px; margin-right: 5px; }
+#ballot .question .bar .type { width: 120px; }
#ballot .question .answers {
background-color: #4c4c4c;
Poll Authoring Tool/Resources/style/sheet.css
400a288dec651aa50528d7958ed7573cc5b6bba8
Bluebie the Pony
blueberry@creativepony.com
http://github.com/GuitarString/Electric-Water/commit/4cdf5fd2249f049b0c1fb8fcd612d3eddeda8fa8
4cdf5fd2249f049b0c1fb8fcd612d3eddeda8fa8
2009-10-30T19:06:57-07:00
2009-10-30T19:06:57-07:00
Fancy pants 'redo' support to compliment the undo, and the addition of keyboard navigation within the ballot editor. Can now use the arrow keys in there to move around between the various fields for +1 Awesome Speediness of Power.
562dbf49dc29d572c0570d3ea51af32d8a32f709
Bluebie the Pony
blueberry@creativepony.com