Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-11 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #705 from team-lab/fix/word-diff-probrem

Browse Source 
fix word-diff javascript error
This commit is contained in:
Naoki Takezoe
2015-04-16 01:52:54 +09:00
parent 7f78815c11 e86ad423c5
commit 797bf37bfa
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/webapp/assets/vendors/jsdifflib/difflib.js vendored
View File

@@ -29,6 +29,9 @@ DAMAGE.
***/
/* Author: Chas Emerick <cemerick@snowtide.com> */
__whitespace = {" ":true, "\t":true, "\n":true, "\f":true, "\r":true};
function __hasOwnProperty(obj, target){
return Object.prototype.hasOwnProperty.call(obj, target);
}
difflib = {
defaultJunkFunction: function (c) {
@@ -93,7 +96,7 @@ difflib = {
// replacement for python's dict.get function -- need easy default values
__dictget: function (dict, key, defaultValue) {
return dict.hasOwnProperty(key) ? dict[key] : defaultValue;
return __hasOwnProperty(dict, key) ? dict[key] : defaultValue;
},
SequenceMatcher: function (a, b, isjunk) {
@@ -122,7 +125,7 @@ difflib = {
var populardict = {};
for (var i = 0; i < b.length; i++) {
var elt = b[i];
if (b2j.hasOwnProperty(elt)) {
if (__hasOwnProperty(b2j, elt)) {
var indices = b2j[elt];
if (n >= 200 && indices.length * 100 > n) {
populardict[elt] = 1;
@@ -151,7 +154,7 @@ difflib = {
}
}
for (var elt in b2j) {
if (b2j.hasOwnProperty(elt) && isjunk(elt)) {
if (__hasOwnProperty(b2j, elt) && isjunk(elt)) {
junkdict[elt] = 1;
delete b2j[elt];
}