kopia lustrzana https://github.com/c9/core
fix metadata tests
rodzic
caad98e5d2
commit
873143a725
|
@ -43,7 +43,6 @@ define(function(require, exports, module) {
|
|||
**/
|
||||
var UndoManager = function() {
|
||||
this.$maxRev = 0;
|
||||
this.mark = 0;
|
||||
this.$fromUndo = false;
|
||||
this.reset();
|
||||
};
|
||||
|
@ -203,7 +202,7 @@ var UndoManager = function() {
|
|||
this.$syncRev = function() {
|
||||
var stack = this.$undoStack;
|
||||
var nextDelta = stack[stack.length - 1];
|
||||
var id = nextDelta && nextDelta[0] && nextDelta[0].id || 0;
|
||||
var id = nextDelta && nextDelta[0].id || 0;
|
||||
this.$redoStackBaseRev = id;
|
||||
this.$rev = id;
|
||||
};
|
||||
|
@ -216,6 +215,7 @@ var UndoManager = function() {
|
|||
this.$undoStack = [];
|
||||
this.$redoStack = [];
|
||||
this.$rev = 0;
|
||||
this.mark = 0;
|
||||
this.selections = [];
|
||||
};
|
||||
|
||||
|
|
|
@ -297,9 +297,13 @@ define(function(require, exports, module) {
|
|||
undoManager.canRedo = this.canRedo;
|
||||
undoManager.getState = this.getState;
|
||||
undoManager.setState = this.setState;
|
||||
this._emit = undoManager.getEmitter();
|
||||
undoManager.bookmark = this.bookmark;
|
||||
undoManager.isAtBookmark = this.isAtBookmark;
|
||||
undoManager.__defineGetter__("position", this.getPosition);
|
||||
undoManager.__defineGetter__("length", this.getLength);
|
||||
undoManager._emit = this._emit = undoManager.getEmitter();
|
||||
|
||||
undoManager.setState(state);
|
||||
this.setState(state);
|
||||
}
|
||||
function updateDeltas(deltas) {
|
||||
if (deltas[0] && deltas[0].deltas) {
|
||||
|
@ -356,7 +360,7 @@ define(function(require, exports, module) {
|
|||
return {
|
||||
stack: stack,
|
||||
mark: aceUndo.mark,
|
||||
position: aceUndo.$rev
|
||||
position: stack.length - 1
|
||||
};
|
||||
},
|
||||
setState: function(e) {
|
||||
|
@ -365,7 +369,11 @@ define(function(require, exports, module) {
|
|||
aceUndo.$undoStack = (e.stack || []).filter(function(x) {
|
||||
return x.length;
|
||||
});
|
||||
aceUndo.$rev = e.position;
|
||||
var stack = aceUndo.$undoStack;
|
||||
var lastDeltaGroup = stack[stack.length] - 1;
|
||||
var lastRev = lastDeltaGroup && lastDeltaGroup[0].id || 0;
|
||||
aceUndo.$rev = lastRev;
|
||||
aceUndo.$maxRev = Math.max(aceUndo.$maxRev, lastRev);
|
||||
this.bookmark(e.mark);
|
||||
},
|
||||
isAtBookmark: function() {
|
||||
|
@ -377,6 +385,14 @@ define(function(require, exports, module) {
|
|||
},
|
||||
setSession: function(session) {
|
||||
this.$aceUndo.setSession(session);
|
||||
},
|
||||
getPosition: function() {
|
||||
var aceUndo = this.$aceUndo;
|
||||
return aceUndo.$undoStack.length - 1;
|
||||
},
|
||||
getLength: function() {
|
||||
var aceUndo = this.$aceUndo;
|
||||
return aceUndo.$undoStack.length + aceUndo.$redoStack.length;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue