1569. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:57:56 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

1569.1 Files compared

#	Location	File	Last Modified
1	C:\Araxis_Merge_Comprasion\Pub_un\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM Portal\trunk\BTSSSPortal\js\ckeditor\samples\old\dialog\assets	my_dialog.js	Tue Dec 20 19:50:51 2016 UTC
2			Wed Feb 1 19:57:56 2017 UTC

1569.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	0	0
Removed	1	48

1569.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

1569.4 Active regular expressions

No regular expressions were active.

1569.5 Comparison detail

1		/**
2		* Copyrig ht (c) 200 3-2015, CK Source - F rederico K nabben. Al l rights r eserved.
3		* This so ftware is covered by CKEditor Commercial License. Usage with out proper license i s prohibit ed.
4		*/
5
6		CKEDITOR.d ialog.add( 'myDialog ', functio n() {
7		re turn {
8		titl e: 'My Dia log',
9		minW idth: 400,
10		minH eight: 200 ,
11		cont ents: [
12		{
13		id: 'tab 1',
14		label: ' First Tab' ,
15		title: ' First Tab' ,
16		elements : [
17		{
18		id : 'input1' ,
19		ty pe: 'text' ,
20		la bel: 'Text Field'
21		},
22		{
23		id : 'select1 ',
24		ty pe: 'selec t',
25		la bel: 'Sele ct Field',
26		it ems: [
27		[ 'o ption1', ' value1' ],
28		[ 'o ption2', ' value2' ]
29		]
30		}
31		]
32		},
33		{
34		id: 'tab 2',
35		label: ' Second Tab ',
36		title: ' Second Tab ',
37		elements : [
38		{
39		id : 'button1 ',
40		ty pe: 'butto n',
41		la bel: 'Butt on Field'
42		}
43		]
44		}
45		]
46		};
47		} );
48