Commit 2a40714a authored by Tristan Cavelier's avatar Tristan Cavelier

Fix bug: SlickGrid crashed when document did not have revision

parent e2cc260a
...@@ -82,8 +82,12 @@ window.OfficeJS_slickgrid.reload = function () { ...@@ -82,8 +82,12 @@ window.OfficeJS_slickgrid.reload = function () {
array[i].icon = mime.icon; array[i].icon = mime.icon;
array[i].app = mime.preferred_application || mime.application; array[i].app = mime.preferred_application || mime.application;
} }
if (array[i].revision) {
array[i].conflict = array[i].revision_object[ array[i].conflict = array[i].revision_object[
array[i].revision].conflict?'X':''; array[i].revision].conflict?'X':'';
} else {
array[i].conflict = '';
}
// dates // dates
// FIXME : we can have 2012/1/1 12:5 // FIXME : we can have 2012/1/1 12:5
// we should have 2012/01/01 12:05 // we should have 2012/01/01 12:05
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment