extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Start to get new diff viewer in, not working yet

Browse Source
This commit is contained in:
nathangray 2019-02-27 09:05:07 -07:00
parent 73600bb541
commit 0ddcd3e9f8
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/js/etemplate/et2_widget_historylog.js
View File

@ -500,20 +500,12 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
{ {
// Large text value - span both columns, and show a nice diff // Large text value - span both columns, and show a nice diff
var jthis = jQuery(this); var jthis = jQuery(this);
if(i == self.NEW_VALUE) if(i === self.NEW_VALUE)
{ {
// Diff widget // Diff widget
widget = self.diff.widget; widget = self.diff.widget;
nodes = self.diff.nodes.clone(); nodes = self.diff.nodes.clone();
if (typeof _data[self.columns[self.NEW_VALUE].id] == "string")
{
value = _data[self.columns[i].id] = {
'old': _data[self.columns[i+1].id],
'new': value
};
}
// Skip column 4 // Skip column 4
jthis.parents("td").attr("colspan", 2) jthis.parents("td").attr("colspan", 2)
.css("border-right", "none"); .css("border-right", "none");
@ -571,7 +563,7 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
this.egw().debug("warn", "Crazy diff value", value); this.egw().debug("warn", "Crazy diff value", value);
return false; return false;
} }
return columnName == 'note' || columnName == 'description' || (value && (value.length > 50 || value.match(/\n/g))); return value=== '***diff***';
}, },
resize: function (_height) resize: function (_height)

3
composer.json
View File

@ -85,7 +85,8 @@
"egroupware/z-push-dev": "self.version", "egroupware/z-push-dev": "self.version",
"egroupware/activesync": "self.version", "egroupware/activesync": "self.version",
"egroupware/adodb-php": "self.version", "egroupware/adodb-php": "self.version",
"pear-pear.horde.org/Horde_Text_Diff": "^2.2" "pear-pear.horde.org/Horde_Text_Diff": "^2.2",
"bower-asset/diff2html": "^2.7"
}, },
"require-dev": { "require-dev": {
}, },