diff --git a/Jenkinsfile b/Jenkinsfile index dd47e4d1e..175d29f41 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,7 +74,7 @@ if(currentBuild.result != 'FAILURE') stage 'Delete Workspace' - def files = findFiles(glob: '**/cireports/spellcheck/*.*') + def files = findFiles(glob: '**/cireports/*.*') if(files.size() > 0) { diff --git a/ej2-javascript/code-snippet/diagram/nodes-treeView/ts/index.html b/ej2-javascript/code-snippet/diagram/nodes-treeView/ts/index.html index 097d4349f..76630be55 100644 --- a/ej2-javascript/code-snippet/diagram/nodes-treeView/ts/index.html +++ b/ej2-javascript/code-snippet/diagram/nodes-treeView/ts/index.html @@ -15,6 +15,7 @@ + @@ -29,4 +30,4 @@

Tree List

- \ No newline at end of file + diff --git a/ej2-javascript/code-snippet/gantt/autofit-columns-cs1/ts/index.html b/ej2-javascript/code-snippet/gantt/autofit-columns-cs1/ts/index.html deleted file mode 100644 index 19ed0fd17..000000000 --- a/ej2-javascript/code-snippet/gantt/autofit-columns-cs1/ts/index.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - EJ2 Gantt - - - - - - - - - - - -
Loading....
-
-
-
- - - \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/checkbox-cs2/ts/index.html b/ej2-javascript/code-snippet/gantt/checkbox-cs2/ts/index.html deleted file mode 100644 index 2febfea30..000000000 --- a/ej2-javascript/code-snippet/gantt/checkbox-cs2/ts/index.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - EJ2 Gantt - - - - - - - - - - - -
Loading....
-
-
-
- - - \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs1/index.css b/ej2-javascript/code-snippet/gantt/column-rendering-cs1/index.css deleted file mode 100644 index e7bcf086c..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs1/index.css +++ /dev/null @@ -1,23 +0,0 @@ -#container { - visibility: hidden; -} - -#loader { - color: #008cff; - font-family: 'Helvetica Neue','calibiri'; - font-size: 14px; - height: 40px; - left: 45%; - position: absolute; - top: 45%; - width: 30%; -} - -#element { - display: block; - height: 350px; -} - -#container #Gantt{ - height:450px; -} \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs1/systemjs.config.js b/ej2-javascript/code-snippet/gantt/column-rendering-cs1/systemjs.config.js deleted file mode 100644 index f91edce14..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs1/systemjs.config.js +++ /dev/null @@ -1,49 +0,0 @@ -System.config({ - transpiler: "typescript", - typescriptOptions: { - compilerOptions: { - target: "umd", - module: "commonjs", - moduleResolution: "node", - emitDecoratorMetadata: true, - experimentalDecorators: true - } - }, - paths: { - "syncfusion:": "https://cdn.syncfusion.com/ej2/32.1.19/" - }, - map: { - main: "index.ts", - typescript: "https://unpkg.com/typescript@2.2.2/lib/typescript.js", - "@syncfusion/ej2-base": "syncfusion:ej2-base/dist/ej2-base.umd.min.js", - "@syncfusion/ej2-markdown-converter": "syncfusion:ej2-markdown-converter/dist/ej2-markdown-converter.umd.min.js", - "@syncfusion/ej2-interactive-chat": "syncfusion:ej2-interactive-chat/dist/ej2-interactive-chat.umd.min.js", - "@syncfusion/ej2-buttons": "syncfusion:ej2-buttons/dist/ej2-buttons.umd.min.js", - "@syncfusion/ej2-calendars": "syncfusion:ej2-calendars/dist/ej2-calendars.umd.min.js", - "@syncfusion/ej2-data": "syncfusion:ej2-data/dist/ej2-data.umd.min.js", - "@syncfusion/ej2-dropdowns": "syncfusion:ej2-dropdowns/dist/ej2-dropdowns.umd.min.js", - "@syncfusion/ej2-notifications":"syncfusion:ej2-notifications/dist/ej2-notifications.umd.min.js", - "@syncfusion/ej2-grids": "syncfusion:ej2-grids/dist/ej2-grids.umd.min.js", - "@syncfusion/ej2-inputs": "syncfusion:ej2-inputs/dist/ej2-inputs.umd.min.js", - "@syncfusion/ej2-layouts": "syncfusion:ej2-layouts/dist/ej2-layouts.umd.min.js", - "@syncfusion/ej2-lists": "syncfusion:ej2-lists/dist/ej2-lists.umd.min.js", - "@syncfusion/ej2-navigations": "syncfusion:ej2-navigations/dist/ej2-navigations.umd.min.js", - "@syncfusion/ej2-popups": "syncfusion:ej2-popups/dist/ej2-popups.umd.min.js", - "@syncfusion/ej2-richtexteditor": "syncfusion:ej2-richtexteditor/dist/ej2-richtexteditor.umd.min.js", - "@syncfusion/ej2-treegrid": "syncfusion:ej2-treegrid/dist/ej2-treegrid.umd.min.js", - "@syncfusion/ej2-gantt": "syncfusion:ej2-gantt/dist/ej2-gantt.umd.min.js", - "@syncfusion/ej2-pdf-export": "syncfusion:ej2-pdf-export/dist/ej2-pdf-export.umd.min.js", - "@syncfusion/ej2-splitbuttons": "syncfusion:ej2-splitbuttons/dist/ej2-splitbuttons.umd.min.js", - "@syncfusion/ej2-excel-export": "syncfusion:ej2-excel-export/dist/ej2-excel-export.umd.min.js", - "@syncfusion/ej2-compression": "syncfusion:ej2-compression/dist/ej2-compression.umd.min.js", - "@syncfusion/ej2-file-utils": "syncfusion:ej2-file-utils/dist/ej2-file-utils.umd.min.js", - "@syncfusion/ej2-svg-base": "syncfusion:ej2-svg-base/dist/ej2-svg-base.umd.min.js", - "@syncfusion/ej2-filemanager": "syncfusion:ej2-filemanager/dist/ej2-filemanager.umd.min.js" - - } -}); - -System.import('index.ts').catch(console.error.bind(console)).then(function () { - document.getElementById('loader').style.display = "none"; - document.getElementById('container').style.visibility = "visible"; -}); \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs2/index.css b/ej2-javascript/code-snippet/gantt/column-rendering-cs2/index.css deleted file mode 100644 index e7bcf086c..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs2/index.css +++ /dev/null @@ -1,23 +0,0 @@ -#container { - visibility: hidden; -} - -#loader { - color: #008cff; - font-family: 'Helvetica Neue','calibiri'; - font-size: 14px; - height: 40px; - left: 45%; - position: absolute; - top: 45%; - width: 30%; -} - -#element { - display: block; - height: 350px; -} - -#container #Gantt{ - height:450px; -} \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs2/systemjs.config.js b/ej2-javascript/code-snippet/gantt/column-rendering-cs2/systemjs.config.js deleted file mode 100644 index f91edce14..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs2/systemjs.config.js +++ /dev/null @@ -1,49 +0,0 @@ -System.config({ - transpiler: "typescript", - typescriptOptions: { - compilerOptions: { - target: "umd", - module: "commonjs", - moduleResolution: "node", - emitDecoratorMetadata: true, - experimentalDecorators: true - } - }, - paths: { - "syncfusion:": "https://cdn.syncfusion.com/ej2/32.1.19/" - }, - map: { - main: "index.ts", - typescript: "https://unpkg.com/typescript@2.2.2/lib/typescript.js", - "@syncfusion/ej2-base": "syncfusion:ej2-base/dist/ej2-base.umd.min.js", - "@syncfusion/ej2-markdown-converter": "syncfusion:ej2-markdown-converter/dist/ej2-markdown-converter.umd.min.js", - "@syncfusion/ej2-interactive-chat": "syncfusion:ej2-interactive-chat/dist/ej2-interactive-chat.umd.min.js", - "@syncfusion/ej2-buttons": "syncfusion:ej2-buttons/dist/ej2-buttons.umd.min.js", - "@syncfusion/ej2-calendars": "syncfusion:ej2-calendars/dist/ej2-calendars.umd.min.js", - "@syncfusion/ej2-data": "syncfusion:ej2-data/dist/ej2-data.umd.min.js", - "@syncfusion/ej2-dropdowns": "syncfusion:ej2-dropdowns/dist/ej2-dropdowns.umd.min.js", - "@syncfusion/ej2-notifications":"syncfusion:ej2-notifications/dist/ej2-notifications.umd.min.js", - "@syncfusion/ej2-grids": "syncfusion:ej2-grids/dist/ej2-grids.umd.min.js", - "@syncfusion/ej2-inputs": "syncfusion:ej2-inputs/dist/ej2-inputs.umd.min.js", - "@syncfusion/ej2-layouts": "syncfusion:ej2-layouts/dist/ej2-layouts.umd.min.js", - "@syncfusion/ej2-lists": "syncfusion:ej2-lists/dist/ej2-lists.umd.min.js", - "@syncfusion/ej2-navigations": "syncfusion:ej2-navigations/dist/ej2-navigations.umd.min.js", - "@syncfusion/ej2-popups": "syncfusion:ej2-popups/dist/ej2-popups.umd.min.js", - "@syncfusion/ej2-richtexteditor": "syncfusion:ej2-richtexteditor/dist/ej2-richtexteditor.umd.min.js", - "@syncfusion/ej2-treegrid": "syncfusion:ej2-treegrid/dist/ej2-treegrid.umd.min.js", - "@syncfusion/ej2-gantt": "syncfusion:ej2-gantt/dist/ej2-gantt.umd.min.js", - "@syncfusion/ej2-pdf-export": "syncfusion:ej2-pdf-export/dist/ej2-pdf-export.umd.min.js", - "@syncfusion/ej2-splitbuttons": "syncfusion:ej2-splitbuttons/dist/ej2-splitbuttons.umd.min.js", - "@syncfusion/ej2-excel-export": "syncfusion:ej2-excel-export/dist/ej2-excel-export.umd.min.js", - "@syncfusion/ej2-compression": "syncfusion:ej2-compression/dist/ej2-compression.umd.min.js", - "@syncfusion/ej2-file-utils": "syncfusion:ej2-file-utils/dist/ej2-file-utils.umd.min.js", - "@syncfusion/ej2-svg-base": "syncfusion:ej2-svg-base/dist/ej2-svg-base.umd.min.js", - "@syncfusion/ej2-filemanager": "syncfusion:ej2-filemanager/dist/ej2-filemanager.umd.min.js" - - } -}); - -System.import('index.ts').catch(console.error.bind(console)).then(function () { - document.getElementById('loader').style.display = "none"; - document.getElementById('container').style.visibility = "visible"; -}); \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs3/index.css b/ej2-javascript/code-snippet/gantt/column-rendering-cs3/index.css deleted file mode 100644 index e7bcf086c..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs3/index.css +++ /dev/null @@ -1,23 +0,0 @@ -#container { - visibility: hidden; -} - -#loader { - color: #008cff; - font-family: 'Helvetica Neue','calibiri'; - font-size: 14px; - height: 40px; - left: 45%; - position: absolute; - top: 45%; - width: 30%; -} - -#element { - display: block; - height: 350px; -} - -#container #Gantt{ - height:450px; -} \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs3/systemjs.config.js b/ej2-javascript/code-snippet/gantt/column-rendering-cs3/systemjs.config.js deleted file mode 100644 index f91edce14..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs3/systemjs.config.js +++ /dev/null @@ -1,49 +0,0 @@ -System.config({ - transpiler: "typescript", - typescriptOptions: { - compilerOptions: { - target: "umd", - module: "commonjs", - moduleResolution: "node", - emitDecoratorMetadata: true, - experimentalDecorators: true - } - }, - paths: { - "syncfusion:": "https://cdn.syncfusion.com/ej2/32.1.19/" - }, - map: { - main: "index.ts", - typescript: "https://unpkg.com/typescript@2.2.2/lib/typescript.js", - "@syncfusion/ej2-base": "syncfusion:ej2-base/dist/ej2-base.umd.min.js", - "@syncfusion/ej2-markdown-converter": "syncfusion:ej2-markdown-converter/dist/ej2-markdown-converter.umd.min.js", - "@syncfusion/ej2-interactive-chat": "syncfusion:ej2-interactive-chat/dist/ej2-interactive-chat.umd.min.js", - "@syncfusion/ej2-buttons": "syncfusion:ej2-buttons/dist/ej2-buttons.umd.min.js", - "@syncfusion/ej2-calendars": "syncfusion:ej2-calendars/dist/ej2-calendars.umd.min.js", - "@syncfusion/ej2-data": "syncfusion:ej2-data/dist/ej2-data.umd.min.js", - "@syncfusion/ej2-dropdowns": "syncfusion:ej2-dropdowns/dist/ej2-dropdowns.umd.min.js", - "@syncfusion/ej2-notifications":"syncfusion:ej2-notifications/dist/ej2-notifications.umd.min.js", - "@syncfusion/ej2-grids": "syncfusion:ej2-grids/dist/ej2-grids.umd.min.js", - "@syncfusion/ej2-inputs": "syncfusion:ej2-inputs/dist/ej2-inputs.umd.min.js", - "@syncfusion/ej2-layouts": "syncfusion:ej2-layouts/dist/ej2-layouts.umd.min.js", - "@syncfusion/ej2-lists": "syncfusion:ej2-lists/dist/ej2-lists.umd.min.js", - "@syncfusion/ej2-navigations": "syncfusion:ej2-navigations/dist/ej2-navigations.umd.min.js", - "@syncfusion/ej2-popups": "syncfusion:ej2-popups/dist/ej2-popups.umd.min.js", - "@syncfusion/ej2-richtexteditor": "syncfusion:ej2-richtexteditor/dist/ej2-richtexteditor.umd.min.js", - "@syncfusion/ej2-treegrid": "syncfusion:ej2-treegrid/dist/ej2-treegrid.umd.min.js", - "@syncfusion/ej2-gantt": "syncfusion:ej2-gantt/dist/ej2-gantt.umd.min.js", - "@syncfusion/ej2-pdf-export": "syncfusion:ej2-pdf-export/dist/ej2-pdf-export.umd.min.js", - "@syncfusion/ej2-splitbuttons": "syncfusion:ej2-splitbuttons/dist/ej2-splitbuttons.umd.min.js", - "@syncfusion/ej2-excel-export": "syncfusion:ej2-excel-export/dist/ej2-excel-export.umd.min.js", - "@syncfusion/ej2-compression": "syncfusion:ej2-compression/dist/ej2-compression.umd.min.js", - "@syncfusion/ej2-file-utils": "syncfusion:ej2-file-utils/dist/ej2-file-utils.umd.min.js", - "@syncfusion/ej2-svg-base": "syncfusion:ej2-svg-base/dist/ej2-svg-base.umd.min.js", - "@syncfusion/ej2-filemanager": "syncfusion:ej2-filemanager/dist/ej2-filemanager.umd.min.js" - - } -}); - -System.import('index.ts').catch(console.error.bind(console)).then(function () { - document.getElementById('loader').style.display = "none"; - document.getElementById('container').style.visibility = "visible"; -}); \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs4/index.css b/ej2-javascript/code-snippet/gantt/column-rendering-cs4/index.css deleted file mode 100644 index e7bcf086c..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs4/index.css +++ /dev/null @@ -1,23 +0,0 @@ -#container { - visibility: hidden; -} - -#loader { - color: #008cff; - font-family: 'Helvetica Neue','calibiri'; - font-size: 14px; - height: 40px; - left: 45%; - position: absolute; - top: 45%; - width: 30%; -} - -#element { - display: block; - height: 350px; -} - -#container #Gantt{ - height:450px; -} \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs4/systemjs.config.js b/ej2-javascript/code-snippet/gantt/column-rendering-cs4/systemjs.config.js deleted file mode 100644 index f91edce14..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs4/systemjs.config.js +++ /dev/null @@ -1,49 +0,0 @@ -System.config({ - transpiler: "typescript", - typescriptOptions: { - compilerOptions: { - target: "umd", - module: "commonjs", - moduleResolution: "node", - emitDecoratorMetadata: true, - experimentalDecorators: true - } - }, - paths: { - "syncfusion:": "https://cdn.syncfusion.com/ej2/32.1.19/" - }, - map: { - main: "index.ts", - typescript: "https://unpkg.com/typescript@2.2.2/lib/typescript.js", - "@syncfusion/ej2-base": "syncfusion:ej2-base/dist/ej2-base.umd.min.js", - "@syncfusion/ej2-markdown-converter": "syncfusion:ej2-markdown-converter/dist/ej2-markdown-converter.umd.min.js", - "@syncfusion/ej2-interactive-chat": "syncfusion:ej2-interactive-chat/dist/ej2-interactive-chat.umd.min.js", - "@syncfusion/ej2-buttons": "syncfusion:ej2-buttons/dist/ej2-buttons.umd.min.js", - "@syncfusion/ej2-calendars": "syncfusion:ej2-calendars/dist/ej2-calendars.umd.min.js", - "@syncfusion/ej2-data": "syncfusion:ej2-data/dist/ej2-data.umd.min.js", - "@syncfusion/ej2-dropdowns": "syncfusion:ej2-dropdowns/dist/ej2-dropdowns.umd.min.js", - "@syncfusion/ej2-notifications":"syncfusion:ej2-notifications/dist/ej2-notifications.umd.min.js", - "@syncfusion/ej2-grids": "syncfusion:ej2-grids/dist/ej2-grids.umd.min.js", - "@syncfusion/ej2-inputs": "syncfusion:ej2-inputs/dist/ej2-inputs.umd.min.js", - "@syncfusion/ej2-layouts": "syncfusion:ej2-layouts/dist/ej2-layouts.umd.min.js", - "@syncfusion/ej2-lists": "syncfusion:ej2-lists/dist/ej2-lists.umd.min.js", - "@syncfusion/ej2-navigations": "syncfusion:ej2-navigations/dist/ej2-navigations.umd.min.js", - "@syncfusion/ej2-popups": "syncfusion:ej2-popups/dist/ej2-popups.umd.min.js", - "@syncfusion/ej2-richtexteditor": "syncfusion:ej2-richtexteditor/dist/ej2-richtexteditor.umd.min.js", - "@syncfusion/ej2-treegrid": "syncfusion:ej2-treegrid/dist/ej2-treegrid.umd.min.js", - "@syncfusion/ej2-gantt": "syncfusion:ej2-gantt/dist/ej2-gantt.umd.min.js", - "@syncfusion/ej2-pdf-export": "syncfusion:ej2-pdf-export/dist/ej2-pdf-export.umd.min.js", - "@syncfusion/ej2-splitbuttons": "syncfusion:ej2-splitbuttons/dist/ej2-splitbuttons.umd.min.js", - "@syncfusion/ej2-excel-export": "syncfusion:ej2-excel-export/dist/ej2-excel-export.umd.min.js", - "@syncfusion/ej2-compression": "syncfusion:ej2-compression/dist/ej2-compression.umd.min.js", - "@syncfusion/ej2-file-utils": "syncfusion:ej2-file-utils/dist/ej2-file-utils.umd.min.js", - "@syncfusion/ej2-svg-base": "syncfusion:ej2-svg-base/dist/ej2-svg-base.umd.min.js", - "@syncfusion/ej2-filemanager": "syncfusion:ej2-filemanager/dist/ej2-filemanager.umd.min.js" - - } -}); - -System.import('index.ts').catch(console.error.bind(console)).then(function () { - document.getElementById('loader').style.display = "none"; - document.getElementById('container').style.visibility = "visible"; -}); \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs5/index.css b/ej2-javascript/code-snippet/gantt/column-rendering-cs5/index.css deleted file mode 100644 index e7bcf086c..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs5/index.css +++ /dev/null @@ -1,23 +0,0 @@ -#container { - visibility: hidden; -} - -#loader { - color: #008cff; - font-family: 'Helvetica Neue','calibiri'; - font-size: 14px; - height: 40px; - left: 45%; - position: absolute; - top: 45%; - width: 30%; -} - -#element { - display: block; - height: 350px; -} - -#container #Gantt{ - height:450px; -} \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs5/systemjs.config.js b/ej2-javascript/code-snippet/gantt/column-rendering-cs5/systemjs.config.js deleted file mode 100644 index f91edce14..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs5/systemjs.config.js +++ /dev/null @@ -1,49 +0,0 @@ -System.config({ - transpiler: "typescript", - typescriptOptions: { - compilerOptions: { - target: "umd", - module: "commonjs", - moduleResolution: "node", - emitDecoratorMetadata: true, - experimentalDecorators: true - } - }, - paths: { - "syncfusion:": "https://cdn.syncfusion.com/ej2/32.1.19/" - }, - map: { - main: "index.ts", - typescript: "https://unpkg.com/typescript@2.2.2/lib/typescript.js", - "@syncfusion/ej2-base": "syncfusion:ej2-base/dist/ej2-base.umd.min.js", - "@syncfusion/ej2-markdown-converter": "syncfusion:ej2-markdown-converter/dist/ej2-markdown-converter.umd.min.js", - "@syncfusion/ej2-interactive-chat": "syncfusion:ej2-interactive-chat/dist/ej2-interactive-chat.umd.min.js", - "@syncfusion/ej2-buttons": "syncfusion:ej2-buttons/dist/ej2-buttons.umd.min.js", - "@syncfusion/ej2-calendars": "syncfusion:ej2-calendars/dist/ej2-calendars.umd.min.js", - "@syncfusion/ej2-data": "syncfusion:ej2-data/dist/ej2-data.umd.min.js", - "@syncfusion/ej2-dropdowns": "syncfusion:ej2-dropdowns/dist/ej2-dropdowns.umd.min.js", - "@syncfusion/ej2-notifications":"syncfusion:ej2-notifications/dist/ej2-notifications.umd.min.js", - "@syncfusion/ej2-grids": "syncfusion:ej2-grids/dist/ej2-grids.umd.min.js", - "@syncfusion/ej2-inputs": "syncfusion:ej2-inputs/dist/ej2-inputs.umd.min.js", - "@syncfusion/ej2-layouts": "syncfusion:ej2-layouts/dist/ej2-layouts.umd.min.js", - "@syncfusion/ej2-lists": "syncfusion:ej2-lists/dist/ej2-lists.umd.min.js", - "@syncfusion/ej2-navigations": "syncfusion:ej2-navigations/dist/ej2-navigations.umd.min.js", - "@syncfusion/ej2-popups": "syncfusion:ej2-popups/dist/ej2-popups.umd.min.js", - "@syncfusion/ej2-richtexteditor": "syncfusion:ej2-richtexteditor/dist/ej2-richtexteditor.umd.min.js", - "@syncfusion/ej2-treegrid": "syncfusion:ej2-treegrid/dist/ej2-treegrid.umd.min.js", - "@syncfusion/ej2-gantt": "syncfusion:ej2-gantt/dist/ej2-gantt.umd.min.js", - "@syncfusion/ej2-pdf-export": "syncfusion:ej2-pdf-export/dist/ej2-pdf-export.umd.min.js", - "@syncfusion/ej2-splitbuttons": "syncfusion:ej2-splitbuttons/dist/ej2-splitbuttons.umd.min.js", - "@syncfusion/ej2-excel-export": "syncfusion:ej2-excel-export/dist/ej2-excel-export.umd.min.js", - "@syncfusion/ej2-compression": "syncfusion:ej2-compression/dist/ej2-compression.umd.min.js", - "@syncfusion/ej2-file-utils": "syncfusion:ej2-file-utils/dist/ej2-file-utils.umd.min.js", - "@syncfusion/ej2-svg-base": "syncfusion:ej2-svg-base/dist/ej2-svg-base.umd.min.js", - "@syncfusion/ej2-filemanager": "syncfusion:ej2-filemanager/dist/ej2-filemanager.umd.min.js" - - } -}); - -System.import('index.ts').catch(console.error.bind(console)).then(function () { - document.getElementById('loader').style.display = "none"; - document.getElementById('container').style.visibility = "visible"; -}); \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-rendering-cs6/index.css b/ej2-javascript/code-snippet/gantt/column-rendering-cs6/index.css deleted file mode 100644 index e7bcf086c..000000000 --- a/ej2-javascript/code-snippet/gantt/column-rendering-cs6/index.css +++ /dev/null @@ -1,23 +0,0 @@ -#container { - visibility: hidden; -} - -#loader { - color: #008cff; - font-family: 'Helvetica Neue','calibiri'; - font-size: 14px; - height: 40px; - left: 45%; - position: absolute; - top: 45%; - width: 30%; -} - -#element { - display: block; - height: 350px; -} - -#container #Gantt{ - height:450px; -} \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/column-resize-cs2/index.css b/ej2-javascript/code-snippet/gantt/column-resize-cs2/index.css deleted file mode 100644 index e7bcf086c..000000000 --- a/ej2-javascript/code-snippet/gantt/column-resize-cs2/index.css +++ /dev/null @@ -1,23 +0,0 @@ -#container { - visibility: hidden; -} - -#loader { - color: #008cff; - font-family: 'Helvetica Neue','calibiri'; - font-size: 14px; - height: 40px; - left: 45%; - position: absolute; - top: 45%; - width: 30%; -} - -#element { - display: block; - height: 350px; -} - -#container #Gantt{ - height:450px; -} \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/data-markers-cs3/index.css b/ej2-javascript/code-snippet/gantt/data-markers-cs3/index.css deleted file mode 100644 index e7bcf086c..000000000 --- a/ej2-javascript/code-snippet/gantt/data-markers-cs3/index.css +++ /dev/null @@ -1,23 +0,0 @@ -#container { - visibility: hidden; -} - -#loader { - color: #008cff; - font-family: 'Helvetica Neue','calibiri'; - font-size: 14px; - height: 40px; - left: 45%; - position: absolute; - top: 45%; - width: 30%; -} - -#element { - display: block; - height: 350px; -} - -#container #Gantt{ - height:450px; -} \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/exception-handling-cs1/index.js b/ej2-javascript/code-snippet/gantt/exception-handling-cs1/index.js index 6a7ca510c..4b3e96b93 100644 --- a/ej2-javascript/code-snippet/gantt/exception-handling-cs1/index.js +++ b/ej2-javascript/code-snippet/gantt/exception-handling-cs1/index.js @@ -10,7 +10,7 @@ var ganttChart = new ej.gantt.Gantt({ ], taskFields: { id: 'TaskID', - name: 'TaskName', + name: 'TaskName', startDate: 'StartDate', duration: 'Duration', parentID: 'ParentID' @@ -18,7 +18,7 @@ var ganttChart = new ej.gantt.Gantt({ columns: [ { field: 'TaskName', width: '150' }, { field: 'StartDate', width: '150' }, - { field: 'Duration', width: '150' } + { field: 'Duration', width: '150' }, ], actionFailure: (args) => { let span = document.createElement('span'); @@ -28,5 +28,3 @@ var ganttChart = new ej.gantt.Gantt({ } }); ganttChart.appendTo('#Gantt'); - - diff --git a/ej2-javascript/code-snippet/gantt/persist-selection-cs1/systemjs.config.js b/ej2-javascript/code-snippet/gantt/persist-selection-cs1/systemjs.config.js deleted file mode 100644 index f91edce14..000000000 --- a/ej2-javascript/code-snippet/gantt/persist-selection-cs1/systemjs.config.js +++ /dev/null @@ -1,49 +0,0 @@ -System.config({ - transpiler: "typescript", - typescriptOptions: { - compilerOptions: { - target: "umd", - module: "commonjs", - moduleResolution: "node", - emitDecoratorMetadata: true, - experimentalDecorators: true - } - }, - paths: { - "syncfusion:": "https://cdn.syncfusion.com/ej2/32.1.19/" - }, - map: { - main: "index.ts", - typescript: "https://unpkg.com/typescript@2.2.2/lib/typescript.js", - "@syncfusion/ej2-base": "syncfusion:ej2-base/dist/ej2-base.umd.min.js", - "@syncfusion/ej2-markdown-converter": "syncfusion:ej2-markdown-converter/dist/ej2-markdown-converter.umd.min.js", - "@syncfusion/ej2-interactive-chat": "syncfusion:ej2-interactive-chat/dist/ej2-interactive-chat.umd.min.js", - "@syncfusion/ej2-buttons": "syncfusion:ej2-buttons/dist/ej2-buttons.umd.min.js", - "@syncfusion/ej2-calendars": "syncfusion:ej2-calendars/dist/ej2-calendars.umd.min.js", - "@syncfusion/ej2-data": "syncfusion:ej2-data/dist/ej2-data.umd.min.js", - "@syncfusion/ej2-dropdowns": "syncfusion:ej2-dropdowns/dist/ej2-dropdowns.umd.min.js", - "@syncfusion/ej2-notifications":"syncfusion:ej2-notifications/dist/ej2-notifications.umd.min.js", - "@syncfusion/ej2-grids": "syncfusion:ej2-grids/dist/ej2-grids.umd.min.js", - "@syncfusion/ej2-inputs": "syncfusion:ej2-inputs/dist/ej2-inputs.umd.min.js", - "@syncfusion/ej2-layouts": "syncfusion:ej2-layouts/dist/ej2-layouts.umd.min.js", - "@syncfusion/ej2-lists": "syncfusion:ej2-lists/dist/ej2-lists.umd.min.js", - "@syncfusion/ej2-navigations": "syncfusion:ej2-navigations/dist/ej2-navigations.umd.min.js", - "@syncfusion/ej2-popups": "syncfusion:ej2-popups/dist/ej2-popups.umd.min.js", - "@syncfusion/ej2-richtexteditor": "syncfusion:ej2-richtexteditor/dist/ej2-richtexteditor.umd.min.js", - "@syncfusion/ej2-treegrid": "syncfusion:ej2-treegrid/dist/ej2-treegrid.umd.min.js", - "@syncfusion/ej2-gantt": "syncfusion:ej2-gantt/dist/ej2-gantt.umd.min.js", - "@syncfusion/ej2-pdf-export": "syncfusion:ej2-pdf-export/dist/ej2-pdf-export.umd.min.js", - "@syncfusion/ej2-splitbuttons": "syncfusion:ej2-splitbuttons/dist/ej2-splitbuttons.umd.min.js", - "@syncfusion/ej2-excel-export": "syncfusion:ej2-excel-export/dist/ej2-excel-export.umd.min.js", - "@syncfusion/ej2-compression": "syncfusion:ej2-compression/dist/ej2-compression.umd.min.js", - "@syncfusion/ej2-file-utils": "syncfusion:ej2-file-utils/dist/ej2-file-utils.umd.min.js", - "@syncfusion/ej2-svg-base": "syncfusion:ej2-svg-base/dist/ej2-svg-base.umd.min.js", - "@syncfusion/ej2-filemanager": "syncfusion:ej2-filemanager/dist/ej2-filemanager.umd.min.js" - - } -}); - -System.import('index.ts').catch(console.error.bind(console)).then(function () { - document.getElementById('loader').style.display = "none"; - document.getElementById('container').style.visibility = "visible"; -}); \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/resource-view-cs4/ts/index.html b/ej2-javascript/code-snippet/gantt/resource-view-cs4/ts/index.html deleted file mode 100644 index ab92ec6b6..000000000 --- a/ej2-javascript/code-snippet/gantt/resource-view-cs4/ts/index.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - EJ2 Gantt - - - - - - - - - - - -
Loading....
-
-
-
- - - - \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/tree-column-cs2/systemjs.config.js b/ej2-javascript/code-snippet/gantt/tree-column-cs2/systemjs.config.js deleted file mode 100644 index f91edce14..000000000 --- a/ej2-javascript/code-snippet/gantt/tree-column-cs2/systemjs.config.js +++ /dev/null @@ -1,49 +0,0 @@ -System.config({ - transpiler: "typescript", - typescriptOptions: { - compilerOptions: { - target: "umd", - module: "commonjs", - moduleResolution: "node", - emitDecoratorMetadata: true, - experimentalDecorators: true - } - }, - paths: { - "syncfusion:": "https://cdn.syncfusion.com/ej2/32.1.19/" - }, - map: { - main: "index.ts", - typescript: "https://unpkg.com/typescript@2.2.2/lib/typescript.js", - "@syncfusion/ej2-base": "syncfusion:ej2-base/dist/ej2-base.umd.min.js", - "@syncfusion/ej2-markdown-converter": "syncfusion:ej2-markdown-converter/dist/ej2-markdown-converter.umd.min.js", - "@syncfusion/ej2-interactive-chat": "syncfusion:ej2-interactive-chat/dist/ej2-interactive-chat.umd.min.js", - "@syncfusion/ej2-buttons": "syncfusion:ej2-buttons/dist/ej2-buttons.umd.min.js", - "@syncfusion/ej2-calendars": "syncfusion:ej2-calendars/dist/ej2-calendars.umd.min.js", - "@syncfusion/ej2-data": "syncfusion:ej2-data/dist/ej2-data.umd.min.js", - "@syncfusion/ej2-dropdowns": "syncfusion:ej2-dropdowns/dist/ej2-dropdowns.umd.min.js", - "@syncfusion/ej2-notifications":"syncfusion:ej2-notifications/dist/ej2-notifications.umd.min.js", - "@syncfusion/ej2-grids": "syncfusion:ej2-grids/dist/ej2-grids.umd.min.js", - "@syncfusion/ej2-inputs": "syncfusion:ej2-inputs/dist/ej2-inputs.umd.min.js", - "@syncfusion/ej2-layouts": "syncfusion:ej2-layouts/dist/ej2-layouts.umd.min.js", - "@syncfusion/ej2-lists": "syncfusion:ej2-lists/dist/ej2-lists.umd.min.js", - "@syncfusion/ej2-navigations": "syncfusion:ej2-navigations/dist/ej2-navigations.umd.min.js", - "@syncfusion/ej2-popups": "syncfusion:ej2-popups/dist/ej2-popups.umd.min.js", - "@syncfusion/ej2-richtexteditor": "syncfusion:ej2-richtexteditor/dist/ej2-richtexteditor.umd.min.js", - "@syncfusion/ej2-treegrid": "syncfusion:ej2-treegrid/dist/ej2-treegrid.umd.min.js", - "@syncfusion/ej2-gantt": "syncfusion:ej2-gantt/dist/ej2-gantt.umd.min.js", - "@syncfusion/ej2-pdf-export": "syncfusion:ej2-pdf-export/dist/ej2-pdf-export.umd.min.js", - "@syncfusion/ej2-splitbuttons": "syncfusion:ej2-splitbuttons/dist/ej2-splitbuttons.umd.min.js", - "@syncfusion/ej2-excel-export": "syncfusion:ej2-excel-export/dist/ej2-excel-export.umd.min.js", - "@syncfusion/ej2-compression": "syncfusion:ej2-compression/dist/ej2-compression.umd.min.js", - "@syncfusion/ej2-file-utils": "syncfusion:ej2-file-utils/dist/ej2-file-utils.umd.min.js", - "@syncfusion/ej2-svg-base": "syncfusion:ej2-svg-base/dist/ej2-svg-base.umd.min.js", - "@syncfusion/ej2-filemanager": "syncfusion:ej2-filemanager/dist/ej2-filemanager.umd.min.js" - - } -}); - -System.import('index.ts').catch(console.error.bind(console)).then(function () { - document.getElementById('loader').style.display = "none"; - document.getElementById('container').style.visibility = "visible"; -}); \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/tree-column-cs3/systemjs.config.js b/ej2-javascript/code-snippet/gantt/tree-column-cs3/systemjs.config.js deleted file mode 100644 index f91edce14..000000000 --- a/ej2-javascript/code-snippet/gantt/tree-column-cs3/systemjs.config.js +++ /dev/null @@ -1,49 +0,0 @@ -System.config({ - transpiler: "typescript", - typescriptOptions: { - compilerOptions: { - target: "umd", - module: "commonjs", - moduleResolution: "node", - emitDecoratorMetadata: true, - experimentalDecorators: true - } - }, - paths: { - "syncfusion:": "https://cdn.syncfusion.com/ej2/32.1.19/" - }, - map: { - main: "index.ts", - typescript: "https://unpkg.com/typescript@2.2.2/lib/typescript.js", - "@syncfusion/ej2-base": "syncfusion:ej2-base/dist/ej2-base.umd.min.js", - "@syncfusion/ej2-markdown-converter": "syncfusion:ej2-markdown-converter/dist/ej2-markdown-converter.umd.min.js", - "@syncfusion/ej2-interactive-chat": "syncfusion:ej2-interactive-chat/dist/ej2-interactive-chat.umd.min.js", - "@syncfusion/ej2-buttons": "syncfusion:ej2-buttons/dist/ej2-buttons.umd.min.js", - "@syncfusion/ej2-calendars": "syncfusion:ej2-calendars/dist/ej2-calendars.umd.min.js", - "@syncfusion/ej2-data": "syncfusion:ej2-data/dist/ej2-data.umd.min.js", - "@syncfusion/ej2-dropdowns": "syncfusion:ej2-dropdowns/dist/ej2-dropdowns.umd.min.js", - "@syncfusion/ej2-notifications":"syncfusion:ej2-notifications/dist/ej2-notifications.umd.min.js", - "@syncfusion/ej2-grids": "syncfusion:ej2-grids/dist/ej2-grids.umd.min.js", - "@syncfusion/ej2-inputs": "syncfusion:ej2-inputs/dist/ej2-inputs.umd.min.js", - "@syncfusion/ej2-layouts": "syncfusion:ej2-layouts/dist/ej2-layouts.umd.min.js", - "@syncfusion/ej2-lists": "syncfusion:ej2-lists/dist/ej2-lists.umd.min.js", - "@syncfusion/ej2-navigations": "syncfusion:ej2-navigations/dist/ej2-navigations.umd.min.js", - "@syncfusion/ej2-popups": "syncfusion:ej2-popups/dist/ej2-popups.umd.min.js", - "@syncfusion/ej2-richtexteditor": "syncfusion:ej2-richtexteditor/dist/ej2-richtexteditor.umd.min.js", - "@syncfusion/ej2-treegrid": "syncfusion:ej2-treegrid/dist/ej2-treegrid.umd.min.js", - "@syncfusion/ej2-gantt": "syncfusion:ej2-gantt/dist/ej2-gantt.umd.min.js", - "@syncfusion/ej2-pdf-export": "syncfusion:ej2-pdf-export/dist/ej2-pdf-export.umd.min.js", - "@syncfusion/ej2-splitbuttons": "syncfusion:ej2-splitbuttons/dist/ej2-splitbuttons.umd.min.js", - "@syncfusion/ej2-excel-export": "syncfusion:ej2-excel-export/dist/ej2-excel-export.umd.min.js", - "@syncfusion/ej2-compression": "syncfusion:ej2-compression/dist/ej2-compression.umd.min.js", - "@syncfusion/ej2-file-utils": "syncfusion:ej2-file-utils/dist/ej2-file-utils.umd.min.js", - "@syncfusion/ej2-svg-base": "syncfusion:ej2-svg-base/dist/ej2-svg-base.umd.min.js", - "@syncfusion/ej2-filemanager": "syncfusion:ej2-filemanager/dist/ej2-filemanager.umd.min.js" - - } -}); - -System.import('index.ts').catch(console.error.bind(console)).then(function () { - document.getElementById('loader').style.display = "none"; - document.getElementById('container').style.visibility = "visible"; -}); \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/tree-column-cs4/index.html b/ej2-javascript/code-snippet/gantt/tree-column-cs4/index.html deleted file mode 100644 index 19ed0fd17..000000000 --- a/ej2-javascript/code-snippet/gantt/tree-column-cs4/index.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - EJ2 Gantt - - - - - - - - - - - -
Loading....
-
-
-
- - - \ No newline at end of file diff --git a/ej2-javascript/code-snippet/gantt/tree-column-cs5/ts/index.html b/ej2-javascript/code-snippet/gantt/tree-column-cs5/ts/index.html deleted file mode 100644 index 19ed0fd17..000000000 --- a/ej2-javascript/code-snippet/gantt/tree-column-cs5/ts/index.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - EJ2 Gantt - - - - - - - - - - - -
Loading....
-
-
-
- - - \ No newline at end of file diff --git a/ej2-javascript/diagram/grid-lines.md b/ej2-javascript/diagram/grid-lines.md index e9e39b028..684f2375a 100644 --- a/ej2-javascript/diagram/grid-lines.md +++ b/ej2-javascript/diagram/grid-lines.md @@ -129,7 +129,11 @@ The following code example illustrates how to customize the thickness of lines a ## Dot grid patterns +<<<<<<< HEAD The appearance of the grid lines can be changed into dots by settings [`gridType`](../api/diagram/snapsettingsmodel#gridtype) of `snapSettings` as Dots. By default, the `gridType` is **Lines**. +======= +The appearance of the grid lines can be changed into dots by settings [`gridType`](../api/diagram/snapsettingsmodel#gridtype) of `snapSettings` as Dots. By default, the grid type is **Lines**. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf The following code illustrates how to render grid patterns as Dots. @@ -206,7 +210,11 @@ Snapping to gridlines can be enabled or disabled using the [`snapConstraints`](. The snap-to-object feature provides visual cues to assist with aligning and spacing diagram elements. A node can snap to its neighboring objects based on specific alignments, such as the same size and position. These alignments are visually represented by smart guide lines in a cyan shade, with the color code **#07EDE1**. +<<<<<<< HEAD The [`snapObjectDistance`](../api/diagram/snapsettingsmodel#snapobjectdistance) property allows you to define minimum distance between the selected object and the nearest object. By default, the `snapObjectDistance` is set to **5**. +======= +The [`snapObjectDistance`](../api/diagram/snapsettingsmodel#snapobjectdistance) property allows you to define minimum distance between the selected object and the nearest object. By default, the snap object distance is set to 5. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf {% if page.publishingplatform == "typescript" %} @@ -276,7 +284,11 @@ The following code example demonstrates how to set the `snapAngle` property and ## Snap line color +<<<<<<< HEAD The [`snapLineColor`](../api/diagram/snapsettingsmodel#snaplinecolor) property allows you to define the color of the snap line used in the diagram. By customizing the snap line color, you can enhance the visual contrast and visibility of these guides, making it easier to achieve accurate alignment. +======= +The [`snapLineColor`](../api/diagram/snapsettingsmodel#snaplinecolor) property allows you to define the color of the snapline used in the diagram. By customizing the snapline color, you can enhance the visual contrast and visibility of these guides, making it easier to achieve accurate alignment. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf This property accepts color values in various formats, such as hexadecimal, RGB, or predefined color names, providing flexibility in how you choose to represent the snap lines in your diagramming application. By default the `snapLineColor` is set to `'#07EDE1'`. diff --git a/ej2-javascript/diagram/js/connectors/connector-customization.md b/ej2-javascript/diagram/js/connectors/connector-customization.md index 66a031e8c..21630850d 100644 --- a/ej2-javascript/diagram/js/connectors/connector-customization.md +++ b/ej2-javascript/diagram/js/connectors/connector-customization.md @@ -150,7 +150,11 @@ Corner radius allows to create connectors with rounded corners. The radius of th ## Connector Appearance +<<<<<<< HEAD * The connector’s [`strokeWidth`](../../api/diagram/strokeStyle#strokewidth), [`strokeColor`](../../api/diagram/strokeStyle#strokecolor), [`strokeDashArray`](../../api/diagram/strokeStyle#strokedasharray), and [`opacity`](../../api/diagram/strokeStyle#opacity) properties are used to customize the appearance of the connector segments. +======= +* The connector’s [`strokeWidth`](../../api/diagram/strokeStyle#strokewidth), [`strokeColor`](../../api/diagram/strokeStyle/#strokecolor), [`strokeDashArray`](../../api/diagram/strokeStyle#strokedasharray), and [`opacity`](../../api/diagram/strokeStyle#opacity) properties are used to customize the appearance of the connector segments. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf * The [`visible`](../../api/diagram/connectormodel#visible) property of the connector enables or disables the visibility of connector. diff --git a/ej2-javascript/diagram/js/labels/label-appearance.md b/ej2-javascript/diagram/js/labels/label-appearance.md index 30d1f76a6..32d9faf4d 100644 --- a/ej2-javascript/diagram/js/labels/label-appearance.md +++ b/ej2-javascript/diagram/js/labels/label-appearance.md @@ -11,7 +11,11 @@ domainurl: ##DomainURL## # Lable Appearance +<<<<<<< HEAD You can change the font style of the annotations with the font specific properties [`fontSize`](../../api/diagram/textstylemodel#fontsize), [`fontFamily`](../../api/diagram/textStyleModel#fontfamily), [`color`](../../api/diagram/textStyleModel#color). +======= +You can change the font style of the annotations with the font specific properties [`fontSize`](../../api/diagram/textstylemodel#fontsize), [`fontFamily`](../../api/diagram/textStyleModel/#fontfamily),[`color`](../../api/diagram/textStyleModel#color). +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf The label’s [`bold`](../../api/diagram/textStyleModel#bold-boolean), [`italic`](../../api/diagram/textStyleModel#italic), and [`textDecoration`](../../api/diagram/textStyleModel#textdecoration) properties are used to style the label’s text. The label’s [`fill`](../../api/diagram/textstylemodel#fill), [`strokeColor`](../../api/diagram/textStyleModel#strokecolor), and [`strokeWidth`](../../api/diagram/textStyleModel#strokewidth) properties are used to define the background color and border color of the annotation and the [`opacity`](../../api/diagram/textStyleModel#opacity) property is used to define the transparency of the annotations. diff --git a/ej2-javascript/diagram/js/mysql-server-js.md b/ej2-javascript/diagram/js/mysql-server-js.md index 777cfff0e..4ec6c5e0e 100644 --- a/ej2-javascript/diagram/js/mysql-server-js.md +++ b/ej2-javascript/diagram/js/mysql-server-js.md @@ -14,7 +14,11 @@ This guide explains how to load and visualize organizational chart data stored i **What is LINQ2DB?** +<<<<<<< HEAD [LINQ2DB](https://linq2db.github.io) is a lightweight object-relational mapping (ORM) library for .NET that simplifies database access. It enables applications to query relational databases such as MySQL using LINQ syntax, providing a type-safe and efficient way to retrieve data without the overhead of larger ORM frameworks. +======= +[LINQ2DB](https://linq2db.github.io/) is a lightweight object-relational mapping (ORM) library for .NET that simplifies database access. It enables applications to query relational databases such as MySQL using LINQ syntax, providing a type-safe and efficient way to retrieve data without the overhead of larger ORM frameworks. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf **Key benefits of LINQ2DB:** @@ -66,7 +70,11 @@ MySQL Server provides the relational database engine used to store organizationa MySQL Workbench is a graphical tool used to connect to MySQL Server, manage databases, execute SQL queries, and inspect data. +<<<<<<< HEAD 1. Download MySQL Workbench Installer version 8.0.47 from [mysql-workbench](https://dev.mysql.com/downloads/workbench) +======= +1. Download MySQL Workbench Installer version 8.0.47 from [mysql-workbench](https://dev.mysql.com/downloads/workbench/) +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf 2. Run the installer and follow the setup wizard. - Choose the setup type as **Complete**. - Click **Finish** after installing MySQL Workbench. diff --git a/ej2-javascript/diagram/js/nodes/customization.md b/ej2-javascript/diagram/js/nodes/customization.md index 1fa2172ae..12afc1b0a 100644 --- a/ej2-javascript/diagram/js/nodes/customization.md +++ b/ej2-javascript/diagram/js/nodes/customization.md @@ -34,7 +34,11 @@ N> The value we set in the getNodeDefaults has the higher priority in rendering. ### Apply style to the node +<<<<<<< HEAD The appearance of a node can be customized by changing its [`fill`](../../api/diagram/shapeStyleModel#fill) color, [`strokeDashArray`](../../api/diagram/shapeStyleModel#strokeDashArray), ['strokeWidth'](../../api/diagram/shapeStyleModel#strokeWidth), ['strokeColor'](../../api/diagram/shapeStyleModel#strokeColor) and [`opacity`](../../api/diagram/shapeStyleModel#strokeColor). The [`visible`](../../api/diagram/node#visible) property of the node enables or disables the visibility of the node. +======= +The appearance of a node can be customized by changing its [`fill`](../../api/diagram/shapeStyleModel#fill) color, [`strokeDashArray`](../../api/diagram/shapeStyleModel#strokeDashArray), ['strokeWidth'](../../api/diagram/shapeStyleModel#strokeWidth), ['strokeColor'](../../api/diagram/shapeStyleModel#strokeColor) and [`opacity`](../../api/diagram/shapeStyleModel#strokeColor). The [`visible`](../../api/diagram/node/#visible) property of the node enables or disables the visibility of the node. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf The following code illustrates how to customize the appearance of the shape. diff --git a/ej2-javascript/diagram/js/symbol-palette/palette-customization.md b/ej2-javascript/diagram/js/symbol-palette/palette-customization.md index 9abbafa43..87eeffe6d 100644 --- a/ej2-javascript/diagram/js/symbol-palette/palette-customization.md +++ b/ej2-javascript/diagram/js/symbol-palette/palette-customization.md @@ -87,7 +87,11 @@ The following example demonstrates how text wrapping and text overflow are appli ### Appearance of symbol description +<<<<<<< HEAD The appearance of a symbol description in the palette can be customized by changing its [`color`](../../api/diagram/symbolDescription#color), [`fill`](../../api/diagram/symbolDescription#fill), [`fontSize`](../../api/diagram/symbolDescription#fontsize), [`fontFamily`](../../api/diagram/symbolDescription#fontfamily), [`bold`](../../api/diagram/symbolDescription#bold), [`italic`](../../api/diagram/symbolDescription#italic), [`textDecoration`](../../api/diagram/symboldescription#textdecoration) and [`margin`](../../api/diagram/symbolDescription#margin) +======= +The appearance of a symbol description in the palette can be customized by changing its [`color`](../../api/diagram/symbolDescription#color) , [`fill`](../../api/diagram/symbolDescription#fill), [`fontSize`](../../api/diagram/symbolDescription#fontsize) , [`fontFamily`](../../api/diagram/symbolDescription#fontfamily), [`bold`](../../api/diagram/symbolDescription#bold) [`italic`](../../api/diagram/symbolDescription#italic), [`textDecoration`](../../api/diagram/symboldescription#textdecoration) and [`margin`](../../api/diagram/symbolDescription#margin) +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf The following code example shows how to customize the symbol description. @@ -223,7 +227,11 @@ The code provided below demonstrates how to define tooltip content for symbols w ### How to enable or disable the default tooltip for shapes in the symbol palette +<<<<<<< HEAD By default, the symbol ID is displayed as a tooltip when hovering over a symbol in the Symbol Palette. To disable this default tooltip, you can use the [`showTooltip`](../../api/diagram/symbolinfo#showtooltip) property within the [`getSymbolInfo`](../../api/diagram/symbolPaletteModel#getsymbolinfo) method. The `showTooltip` property is set to **true** by default, which enables the tooltip. +======= +By default, the symbol ID is displayed as a tooltip when hovering over a symbol in the Symbol Palette. To disable this default tooltip, you can use the [`showTooltip`](../../api/diagram/symbolInfo#showTooltip) property within the [`getSymbolInfo`](../../api/diagram/symbolPaletteModel#getsymbolinfo) method. The `showTooltip` property is set to **true** by default, which enables the tooltip. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf The following example demonstrates how to configure selective tooltip display: @@ -265,7 +273,11 @@ The following code snippet will demonstrate how to define two different tooltip ## Localization +<<<<<<< HEAD To localize the symbol palette search box, we need to define the [`locale`](../../api/diagram/symbolPaletteModel#locale) property of the symbol palette with our preferred culture. In the example below, we use **de-DE**, which is the locale code for German as used in Germany. +======= +To localize the symbol palette search box, we need to define the [`locale`](../../api/diagram/symbolPaletteModel#locale) property of the symbol palette with our preferred culture. In the example below, we use **'de-DE**', which is the locale code for German as used in Germany. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf The following code shows how to localize symbol palette. diff --git a/ej2-javascript/diagram/ts/getting-started.md b/ej2-javascript/diagram/ts/getting-started.md index 61339ca67..d1306831c 100644 --- a/ej2-javascript/diagram/ts/getting-started.md +++ b/ej2-javascript/diagram/ts/getting-started.md @@ -20,8 +20,13 @@ This section explains the steps required to create a simple diagram and demonstr Ensure the following tools are installed on your machine: * [Git](https://git-scm.com/downloads) +<<<<<<< HEAD * [Node.js](https://nodejs.org/en) * [Visual Studio Code](https://code.visualstudio.com) +======= +* [Node.js](https://nodejs.org/en/) +* [Visual Studio Code](https://code.visualstudio.com/) +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf ## Set up the development environment diff --git a/ej2-javascript/diagram/ts/mysql-server-ts.md b/ej2-javascript/diagram/ts/mysql-server-ts.md index 9a324ec63..1c1e1b557 100644 --- a/ej2-javascript/diagram/ts/mysql-server-ts.md +++ b/ej2-javascript/diagram/ts/mysql-server-ts.md @@ -14,7 +14,11 @@ This guide explains how to load and visualize organizational chart data stored i **What is LINQ2DB?** +<<<<<<< HEAD [LINQ2DB](https://linq2db.github.io) is a lightweight object-relational mapping (ORM) library for .NET that simplifies database access. It enables applications to query relational databases such as MySQL using LINQ syntax, providing a type-safe and efficient way to retrieve data without the overhead of larger ORM frameworks. +======= +[LINQ2DB](https://linq2db.github.io/) is a lightweight object-relational mapping (ORM) library for .NET that simplifies database access. It enables applications to query relational databases such as MySQL using LINQ syntax, providing a type-safe and efficient way to retrieve data without the overhead of larger ORM frameworks. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf **Key benefits of LINQ2DB:** @@ -66,7 +70,11 @@ MySQL Server provides the relational database engine used to store organizationa MySQL Workbench is a graphical tool used to connect to MySQL Server, manage databases, execute SQL queries, and inspect data. +<<<<<<< HEAD 1. Download MySQL Workbench Installer version 8.0.47 from [mysql-workbench](https://dev.mysql.com/downloads/workbench) +======= +1. Download MySQL Workbench Installer version 8.0.47 from [mysql-workbench](https://dev.mysql.com/downloads/workbench/) +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf 2. Run the installer and follow the setup wizard. - Choose the setup type as **Complete**. - Click **Finish** after installing MySQL Workbench. diff --git a/ej2-javascript/gantt/columns/column-resizing.md b/ej2-javascript/gantt/columns/column-resizing.md index a45a10e01..61440b8e7 100644 --- a/ej2-javascript/gantt/columns/column-resizing.md +++ b/ej2-javascript/gantt/columns/column-resizing.md @@ -244,4 +244,4 @@ To resize a column: The screenshot below illustrates column resizing on a touch device. -![Column resize](../images/column-resize.png) \ No newline at end of file +![Column resize](./images/column-resize.png) \ No newline at end of file diff --git a/ej2-javascript/markdown-editor/ts/getting-started.md b/ej2-javascript/markdown-editor/ts/getting-started.md index ffca8ac43..b872a51f8 100644 --- a/ej2-javascript/markdown-editor/ts/getting-started.md +++ b/ej2-javascript/markdown-editor/ts/getting-started.md @@ -123,8 +123,13 @@ editor.appendTo('#editor'); +<<<<<<< HEAD
+======= +
+ +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf @@ -134,9 +139,14 @@ editor.appendTo('#editor'); ## Run the application + +Use the following command to run the application. +<<<<<<< HEAD Use the following command to run the application. +======= +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf ```bash npm run dev ``` diff --git a/ej2-javascript/ts/ai-tools/ai-powered-development.md b/ej2-javascript/ts/ai-tools/ai-powered-development.md index e9792e649..6b3f32478 100644 --- a/ej2-javascript/ts/ai-tools/ai-powered-development.md +++ b/ej2-javascript/ts/ai-tools/ai-powered-development.md @@ -3,7 +3,11 @@ layout: post title: AI-Powered Development with JavaScript Controls | Syncfusion description: Master AI-powered development with Syncfusion JavaScript controls using MCP Server and skills. Learn which approach fits the workflow and get better results. platform: ej2-javascript +<<<<<<< HEAD control: AI AssistView +======= +control: AI Assist +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf documentation: ug domainurl: ##DomainURL## --- diff --git a/ej2-javascript/ts/getting-started/electron.md b/ej2-javascript/ts/getting-started/electron.md index dd84b56c6..4831affe6 100644 --- a/ej2-javascript/ts/getting-started/electron.md +++ b/ej2-javascript/ts/getting-started/electron.md @@ -62,13 +62,18 @@ npm i @syncfusion/ej2-grids After installing the Syncfusion® control packages in the application, create a `~/style.css` file in the application root directory then add the required theme based on the controls used. +<<<<<<< HEAD Syncfusion® JavaScript controls comes with [built-in](https://ej2.syncfusion.com/documentation/appearance/theme) themes, which are available in [theme packages](https://ej2.syncfusion.com/documentation/appearance/theme#theme-packages). It is easy to adapt the Syncfusion® JavaScript controls based on the application style by referring to any of the [built-in](https://ej2.syncfusion.com/documentation/appearance/theme) themes. +======= +Syncfusion® JavaScript controls comes with [built-in](https://ej2.syncfusion.com/documentation/appearance/theme) themes, which are available in installed packages. It is easy to adapt the Syncfusion® JavaScript controls based on the application style by referring to any of the [built-in](https://ej2.syncfusion.com/documentation/appearance/theme) themes. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf Open the application in Visual Studio Code. In this application, the `Fluent2` theme is used. To install the [Fluent2](https://www.npmjs.com/package/@syncfusion/ej2-fluent2-theme) theme package, use the following command: {% tabs %} {% highlight bash tabtitle="npm" %} +<<<<<<< HEAD npm install @syncfusion/ej2-fluent2-theme --save {% endhighlight %} @@ -83,6 +88,9 @@ Import the `Fluent2` theme for the Grid control to the `~/style.css` file as fol {% endhighlight %} {% endtabs %} +======= +> Grid control have dependencies on other Syncfusion® controls, so CSS references for the dependent control must be added in order to use all Grid functionalities. Check out the [themes](https://ej2.syncfusion.com/documentation/appearance/theme) section to know more about built-in themes and combined CSS reference of all controls. +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf ## Add Syncfusion® control to the application diff --git a/ej2-javascript/ts/getting-started/quick-start.md b/ej2-javascript/ts/getting-started/quick-start.md index 3b3786119..9278e38ac 100644 --- a/ej2-javascript/ts/getting-started/quick-start.md +++ b/ej2-javascript/ts/getting-started/quick-start.md @@ -53,6 +53,7 @@ Syncfusion® JavaScript controls provide bui The quickstart application is preconfigured to use the `Fluent2` theme. To install the [Fluent2](https://www.npmjs.com/package/@syncfusion/ej2-fluent2-theme) theme package, use the following command: +<<<<<<< HEAD {% tabs %} {% highlight bash tabtitle="npm" %} @@ -70,6 +71,11 @@ The required styles are imported in the `~/src/styles/styles.css` file, as shown {% endhighlight %} {% endtabs %} +======= +``` +@import "../../node_modules/@syncfusion/ej2/fluent2.css"; +``` +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf > Learn more about [built-in themes and individual control CSS references](https://ej2.syncfusion.com/documentation/appearance/theme). diff --git a/ej2-javascript/ts/getting-started/sharepoint.md b/ej2-javascript/ts/getting-started/sharepoint.md index 19222a254..16245115e 100644 --- a/ej2-javascript/ts/getting-started/sharepoint.md +++ b/ej2-javascript/ts/getting-started/sharepoint.md @@ -57,8 +57,13 @@ Next, it will ask the specific information about the web part. 1.Install the [`@syncfusion/ej2-buttons`](https://www.npmjs.com/package/@syncfusion/ej2-buttons) package and required theme package from npm in the application using the following command line. ``` +<<<<<<< HEAD npm install @syncfusion/ej2-buttons @syncfusion/ej2-fabric-theme --save ``` +======= +npm install @syncfusion/ej2 --save + ``` +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf 2.Open the SharePoint application in Visual Studio Code, and add the Syncfusion® JavaScript Button control script and styles in the `~/src/webparts/buttonComponent/ButtonComponentWebPart.ts` file. @@ -76,7 +81,11 @@ import * as strings from 'ButtonComponentWebPartStrings'; import { Button } from '@syncfusion/ej2-buttons'; // add Syncfusion Essential JS 2 style reference from node_modules +<<<<<<< HEAD require('../../../node_modules/@syncfusion/ej2-fabric-theme/styles/fabric.css'); +======= +require('../../../node_modules/@syncfusion/ej2/fabric.css'); +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf .... .... diff --git a/ej2-typescript-toc.html b/ej2-typescript-toc.html index 5efb2128f..9fd8ce9e2 100644 --- a/ej2-typescript-toc.html +++ b/ej2-typescript-toc.html @@ -28,7 +28,10 @@
  • Skills
    • +<<<<<<< HEAD
  • Agentic UI Builder
    • +======= +>>>>>>> 6d423ae3a72932cc7a70f3b683cc6314d695c6cf
  • Release Notes
    • @@ -1304,8 +1307,12 @@