fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disabling save dialog's text area while saving
[fnpeditor.git]
/
modules
/
documentHistory
/
documentHistory.js
diff --git
a/modules/documentHistory/documentHistory.js
b/modules/documentHistory/documentHistory.js
index
0db2a75
..
d5f20d4
100644
(file)
--- a/
modules/documentHistory/documentHistory.js
+++ b/
modules/documentHistory/documentHistory.js
@@
-27,16
+27,17
@@
return function(sandbox) {
\r
var toggleItemViews = function(toggle) {
\r
itemViews.forEach(function(view) {
\r
\r
var toggleItemViews = function(toggle) {
\r
itemViews.forEach(function(view) {
\r
- view.toggle(toggle);
\r
+ if(!historyItems.selected(view.item))
\r
+ view.toggle(toggle);
\r
});
\r
}
\r
\r
var historyItems = {
\r
_itemsById: {},
\r
_selected: [],
\r
});
\r
}
\r
\r
var historyItems = {
\r
_itemsById: {},
\r
_selected: [],
\r
- select: function(i
d
) {
\r
+ select: function(i
tem
) {
\r
if(this._selected.length < 2) {
\r
if(this._selected.length < 2) {
\r
- this._selected.push(i
d
);
\r
+ this._selected.push(i
tem.version
);
\r
if(this._selected.length === 2)
\r
toggleItemViews(false);
\r
return true;
\r
if(this._selected.length === 2)
\r
toggleItemViews(false);
\r
return true;
\r
@@
-44,40
+45,40
@@
return function(sandbox) {
return false;
\r
},
\r
unselect: function(item) {
\r
return false;
\r
},
\r
unselect: function(item) {
\r
- this._selected = _.without(this._selected, i
d
);
\r
+ this._selected = _.without(this._selected, i
tem.version
);
\r
if(this._selected.length < 2)
\r
toggleItemViews(true);
\r
},
\r
add: function(item) {
\r
if(this._selected.length < 2)
\r
toggleItemViews(true);
\r
},
\r
add: function(item) {
\r
- this._itemsById[item.
id
] = item;
\r
+ this._itemsById[item.
version
] = item;
\r
},
\r
selected: function(item) {
\r
},
\r
selected: function(item) {
\r
- return _.contains(
_selected, item.id
);
\r
+ return _.contains(
this._selected, item.version
);
\r
}
\r
};
\r
\r
var itemView = function(item) {
\r
this.item = item;
\r
this.dom = $(this.template(item));
\r
}
\r
};
\r
\r
var itemView = function(item) {
\r
this.item = item;
\r
this.dom = $(this.template(item));
\r
- this.dom.on('click',
this.onItemClicked
);
\r
+ this.dom.on('click',
_.bind(this.onItemClicked, this)
);
\r
};
\r
itemView.prototype.template = _.template(itemTemplateSrc);
\r
itemView.prototype.onItemClicked = function() {
\r
};
\r
itemView.prototype.template = _.template(itemTemplateSrc);
\r
itemView.prototype.onItemClicked = function() {
\r
- if(historyItems.selected(item)) {
\r
- historyItems.unselect(item);
\r
+ if(historyItems.selected(
this.
item)) {
\r
+ historyItems.unselect(
this.
item);
\r
this.dimItem();
\r
this.dimItem();
\r
- } else if(historyItems.select(item)) {
\r
+ } else if(historyItems.select(
this.
item)) {
\r
this.highlightItem();
\r
}
\r
};
\r
itemView.prototype.highlightItem = function() {
\r
this.highlightItem();
\r
}
\r
};
\r
itemView.prototype.highlightItem = function() {
\r
-
\r
+ this.dom.addClass('highlighted');
\r
};
\r
itemView.prototype.dimItem = function() {
\r
};
\r
itemView.prototype.dimItem = function() {
\r
-
\r
+ this.dom.removeClass('highlighted');
\r
};
\r
itemView.prototype.toggle = function(toggle) {
\r
};
\r
itemView.prototype.toggle = function(toggle) {
\r
-
\r
+ this.dom.toggleClass('disabled', !toggle);
\r
};
\r
\r
\r
};
\r
\r
\r