From 88cd9bdbc72d208baa7cad42dd6a687055a800b6 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Thu, 12 Sep 2019 17:20:14 +0530 Subject: fixed code and changed modals --- static/website/js/jsdiff.js | 161 -------------------------------------------- 1 file changed, 161 deletions(-) delete mode 100644 static/website/js/jsdiff.js (limited to 'static/website/js/jsdiff.js') diff --git a/static/website/js/jsdiff.js b/static/website/js/jsdiff.js deleted file mode 100644 index d89d3f7..0000000 --- a/static/website/js/jsdiff.js +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Javascript Diff Algorithm - * By John Resig (http://ejohn.org/) - * Modified by Chu Alan "sprite" - * - * Released under the MIT license. - * - * More Info: - * http://ejohn.org/projects/javascript-diff-algorithm/ - */ - -function escape(s) { - var n = s; - n = n.replace(/&/g, "&"); - n = n.replace(//g, ">"); - n = n.replace(/"/g, """); - - return n; -} - -function diffString( o, n ) { - o = o.replace(/\s+$/, ''); - n = n.replace(/\s+$/, ''); - - var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/) ); - var str = ""; - - var oSpace = o.match(/\s+/g); - if (oSpace == null) { - oSpace = ["\n"]; - } else { - oSpace.push("\n"); - } - var nSpace = n.match(/\s+/g); - if (nSpace == null) { - nSpace = ["\n"]; - } else { - nSpace.push("\n"); - } - - if (out.n.length == 0) { - for (var i = 0; i < out.o.length; i++) { - str += '' + escape(out.o[i]) + oSpace[i] + ""; - } - } else { - if (out.n[0].text == null) { - for (n = 0; n < out.o.length && out.o[n].text == null; n++) { - str += '' + escape(out.o[n]) + oSpace[n] + ""; - } - } - - for ( var i = 0; i < out.n.length; i++ ) { - if (out.n[i].text == null) { - str += '' + escape(out.n[i]) + nSpace[i] + ""; - } else { - var pre = ""; - - for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++ ) { - pre += '' + escape(out.o[n]) + oSpace[n] + ""; - } - str += " " + out.n[i].text + nSpace[i] + pre; - } - } - } - - return str; -} - -function randomColor() { - return "rgb(" + (Math.random() * 100) + "%, " + - (Math.random() * 100) + "%, " + - (Math.random() * 100) + "%)"; -} -function diffString2( o, n ) { - o = o.replace(/\s+$/, ''); - n = n.replace(/\s+$/, ''); - - var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/) ); - - var oSpace = o.match(/\s+/g); - if (oSpace == null) { - oSpace = ["\n"]; - } else { - oSpace.push("\n"); - } - var nSpace = n.match(/\s+/g); - if (nSpace == null) { - nSpace = ["\n"]; - } else { - nSpace.push("\n"); - } - - var os = ""; - var colors = new Array(); - for (var i = 0; i < out.o.length; i++) { - colors[i] = randomColor(); - - if (out.o[i].text != null) { - os += '' + - escape(out.o[i].text) + oSpace[i] + ""; - } else { - os += "" + escape(out.o[i]) + oSpace[i] + ""; - } - } - - var ns = ""; - for (var i = 0; i < out.n.length; i++) { - if (out.n[i].text != null) { - ns += '' + - escape(out.n[i].text) + nSpace[i] + ""; - } else { - ns += "" + escape(out.n[i]) + nSpace[i] + ""; - } - } - - return { o : os , n : ns }; -} - -function diff( o, n ) { - var ns = new Object(); - var os = new Object(); - - for ( var i = 0; i < n.length; i++ ) { - if ( ns[ n[i] ] == null ) - ns[ n[i] ] = { rows: new Array(), o: null }; - ns[ n[i] ].rows.push( i ); - } - - for ( var i = 0; i < o.length; i++ ) { - if ( os[ o[i] ] == null ) - os[ o[i] ] = { rows: new Array(), n: null }; - os[ o[i] ].rows.push( i ); - } - - for ( var i in ns ) { - if ( ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1 ) { - n[ ns[i].rows[0] ] = { text: n[ ns[i].rows[0] ], row: os[i].rows[0] }; - o[ os[i].rows[0] ] = { text: o[ os[i].rows[0] ], row: ns[i].rows[0] }; - } - } - - for ( var i = 0; i < n.length - 1; i++ ) { - if ( n[i].text != null && n[i+1].text == null && n[i].row + 1 < o.length && o[ n[i].row + 1 ].text == null && - n[i+1] == o[ n[i].row + 1 ] ) { - n[i+1] = { text: n[i+1], row: n[i].row + 1 }; - o[n[i].row+1] = { text: o[n[i].row+1], row: i + 1 }; - } - } - - for ( var i = n.length - 1; i > 0; i-- ) { - if ( n[i].text != null && n[i-1].text == null && n[i].row > 0 && o[ n[i].row - 1 ].text == null && - n[i-1] == o[ n[i].row - 1 ] ) { - n[i-1] = { text: n[i-1], row: n[i].row - 1 }; - o[n[i].row-1] = { text: o[n[i].row-1], row: i - 1 }; - } - } - - return { o: o, n: n }; -} - -- cgit From 760c6ef028bd4866a81a9e8f00d6c73f828a276c Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Wed, 17 Jul 2019 14:56:54 +0530 Subject: added file select validation and varible for upload file api url --- static/website/js/jsdiff.js | 1 + 1 file changed, 1 insertion(+) create mode 120000 static/website/js/jsdiff.js (limited to 'static/website/js/jsdiff.js') diff --git a/static/website/js/jsdiff.js b/static/website/js/jsdiff.js new file mode 120000 index 0000000..57c6486 --- /dev/null +++ b/static/website/js/jsdiff.js @@ -0,0 +1 @@ +/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/js/jsdiff.js \ No newline at end of file -- cgit From e87d9feb957b25afefc4eee982e76b4a7a045177 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Fri, 13 Sep 2019 15:01:11 +0530 Subject: fixed conflict --- static/website/js/jsdiff.js | 1 - 1 file changed, 1 deletion(-) delete mode 120000 static/website/js/jsdiff.js (limited to 'static/website/js/jsdiff.js') diff --git a/static/website/js/jsdiff.js b/static/website/js/jsdiff.js deleted file mode 120000 index 57c6486..0000000 --- a/static/website/js/jsdiff.js +++ /dev/null @@ -1 +0,0 @@ -/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/js/jsdiff.js \ No newline at end of file -- cgit From 489f16974da5742c4dfe6436ce11783bed985151 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Fri, 13 Sep 2019 16:41:12 +0530 Subject: updated the default config file --- static/website/js/jsdiff.js | 1 + 1 file changed, 1 insertion(+) create mode 120000 static/website/js/jsdiff.js (limited to 'static/website/js/jsdiff.js') diff --git a/static/website/js/jsdiff.js b/static/website/js/jsdiff.js new file mode 120000 index 0000000..57c6486 --- /dev/null +++ b/static/website/js/jsdiff.js @@ -0,0 +1 @@ +/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/js/jsdiff.js \ No newline at end of file -- cgit