From b88972ab267ac2ad64fdb035591a0706312cac61 Mon Sep 17 00:00:00 2001 From: sivaranjith-78 Date: Mon, 13 Oct 2025 20:42:21 +0530 Subject: [PATCH 1/2] 984305: Resolved conflict from diagram side --- .../symbol-palette-contentFnTemplate/index.ts | 4 ---- .../diagram/ts/symbol-palette/symbol-palette.md | 13 ------------- 2 files changed, 17 deletions(-) diff --git a/ej2-javascript/code-snippet/diagram/symbol-palette-contentFnTemplate/index.ts b/ej2-javascript/code-snippet/diagram/symbol-palette-contentFnTemplate/index.ts index 6ff22ef08..f36affa4c 100644 --- a/ej2-javascript/code-snippet/diagram/symbol-palette-contentFnTemplate/index.ts +++ b/ej2-javascript/code-snippet/diagram/symbol-palette-contentFnTemplate/index.ts @@ -1,8 +1,4 @@ -<<<<<<< HEAD -import { SymbolPalette, NodeModel, Diagram } from '@syncfusion/ej2-diagrams'; -======= import { SymbolPalette, Diagram } from '@syncfusion/ej2-diagrams'; ->>>>>>> 5e0432fe790d22c521f22d2e5b323e0fb8b8fb04 // Template for the HTML and SVG Shape. function template(obj: any) { diff --git a/ej2-javascript/diagram/ts/symbol-palette/symbol-palette.md b/ej2-javascript/diagram/ts/symbol-palette/symbol-palette.md index 284d909cd..aa38667c5 100644 --- a/ej2-javascript/diagram/ts/symbol-palette/symbol-palette.md +++ b/ej2-javascript/diagram/ts/symbol-palette/symbol-palette.md @@ -95,13 +95,8 @@ The Symbol Palette supports the creation of complex nodes using HTML or SVG temp Templates can be defined either as strings or functions and assigned to the node's `content` property. Function-based templates offer the flexibility to generate dynamic content based on node-specific properties or external data sources. {% tabs %} -<<<<<<< HEAD {% highlight ts tabtitle="index.ts" %} {% include code-snippet/diagram/symbol-palette-contentFnTemplate/index.ts %} -======= -{% highlight js tabtitle="index.js" %} -{% include code-snippet/diagram/symbol-palette-contentFnTemplate/index.js %} ->>>>>>> 5e0432fe790d22c521f22d2e5b323e0fb8b8fb04 {% endhighlight %} {% highlight html tabtitle="index.html" %} {% include code-snippet/diagram/symbol-palette-contentFnTemplate/index.html %} @@ -118,11 +113,7 @@ To drag and drop symbols from the palette to the diagram canvas, mousedown on th ## Add symbols to palette at runtime -<<<<<<< HEAD Symbols can be added to palette at runtime by using public method, [`addPaletteItem`](../../api/diagram/#palette/). The following example shows how to add shapes to the palette at runtime. -======= -Symbols can be added to palette at runtime by using public method, [`addPaletteItem`](../../api/diagram/palette/). The following example shows how to add shapes to the palette at runtime. ->>>>>>> 5e0432fe790d22c521f22d2e5b323e0fb8b8fb04 {% tabs %} {% highlight ts tabtitle="index.ts" %} @@ -137,11 +128,7 @@ Symbols can be added to palette at runtime by using public method, [`addPaletteI ## Remove symbols from palette at runtime -<<<<<<< HEAD Symbols can be removed from palette at runtime by using public method, [`removePaletteItem`](../../api/diagram/#palette/). The following example shows how to remove shapes from the palette at runtime. -======= -Symbols can be removed from palette at runtime by using public method, [`removePaletteItem`](../../api/diagram/palette/). The following example shows how to remove shapes from the palette at runtime. ->>>>>>> 5e0432fe790d22c521f22d2e5b323e0fb8b8fb04 {% tabs %} {% highlight ts tabtitle="index.ts" %} From 4c0539663a63ccfa2b80612f7af8609d8de486b7 Mon Sep 17 00:00:00 2001 From: JamunaSundaramSF3699 Date: Tue, 14 Oct 2025 10:43:09 +0530 Subject: [PATCH 2/2] documentation(984305):Resolve issue --- ej2-javascript-toc.html | 3 --- ej2-javascript/chat-ui/js/es5-getting-started.md | 4 ---- .../ai-assistview/ai-integrations/gemini-ai/index.ts | 4 ---- .../ai-assistview/ai-integrations/open-ai/index.ts | 8 -------- ej2-javascript/grid/getting-started.md | 4 ---- ej2-typescript-toc.html | 3 --- 6 files changed, 26 deletions(-) diff --git a/ej2-javascript-toc.html b/ej2-javascript-toc.html index 2fe7a9e34..da612e6f3 100644 --- a/ej2-javascript-toc.html +++ b/ej2-javascript-toc.html @@ -174,12 +174,9 @@
  • Azure Open AI
    • -<<<<<<< HEAD -=======
  • Ollama LLM
    • ->>>>>>> 5e0432fe790d22c521f22d2e5b323e0fb8b8fb04
  • Toolbar items
    • diff --git a/ej2-javascript/chat-ui/js/es5-getting-started.md b/ej2-javascript/chat-ui/js/es5-getting-started.md index 92563f75e..ddecfb8ae 100644 --- a/ej2-javascript/chat-ui/js/es5-getting-started.md +++ b/ej2-javascript/chat-ui/js/es5-getting-started.md @@ -123,11 +123,7 @@ The [`Custom Resource Generator (CRG)`](https://crg.syncfusion.com/) is an onlin -<<<<<<< HEAD - -======= ->>>>>>> 5e0432fe790d22c521f22d2e5b323e0fb8b8fb04 diff --git a/ej2-javascript/code-snippet/ai-assistview/ai-integrations/gemini-ai/index.ts b/ej2-javascript/code-snippet/ai-assistview/ai-integrations/gemini-ai/index.ts index b6e83ab68..e4ca725e6 100644 --- a/ej2-javascript/code-snippet/ai-assistview/ai-integrations/gemini-ai/index.ts +++ b/ej2-javascript/code-snippet/ai-assistview/ai-integrations/gemini-ai/index.ts @@ -1,9 +1,5 @@ -<<<<<<< HEAD -import { AIAssistView, PromptRequestEventArgs } from '@syncfusion/ej2-interactive-chat'; -======= import { AIAssistView, PromptRequestEventArgs } from '@syncfusion/ej2-interactive-chat'; ->>>>>>> 5e0432fe790d22c521f22d2e5b323e0fb8b8fb04 import { GoogleGenerativeAI } from '@google/generative-ai'; import { marked } from 'marked'; diff --git a/ej2-javascript/code-snippet/ai-assistview/ai-integrations/open-ai/index.ts b/ej2-javascript/code-snippet/ai-assistview/ai-integrations/open-ai/index.ts index 7deb7df11..0aa372ccd 100644 --- a/ej2-javascript/code-snippet/ai-assistview/ai-integrations/open-ai/index.ts +++ b/ej2-javascript/code-snippet/ai-assistview/ai-integrations/open-ai/index.ts @@ -1,19 +1,11 @@ import { AIAssistView } from '@syncfusion/ej2-interactive-chat'; import marked from 'marked'; -<<<<<<< HEAD -// Initialize Open API (using OpenAI API in this case) -const azureOpenAIApiKey = 'YOUR_AZURE_OPENAI_API_KEY'; // replace your key -const azureOpenAIEndpoint = 'YOUR_AZURE_OPENAI_API_ENDPOINT'; // replace your endpoint -const azureOpenAIApiVersion = 'YOUR_AZURE_OPENAI_API_VERSION'; // replace to match your resource -const azureDeploymentName = 'YOUR_DEPLOYMENT_NAME'; // your Azure OpenAI deployment name -======= // Initialize Gemini API (using OpenAI API in this case) const azureOpenAIApiKey = ''; // replace your key const azureOpenAIEndpoint = ''; // replace your endpoint const azureOpenAIApiVersion = ''; // replace to match your resource const azureDeploymentName = ''; // your Azure OpenAI deployment name ->>>>>>> 5e0432fe790d22c521f22d2e5b323e0fb8b8fb04 let stopStreaming = false; let suggestions = [ 'What are the best tools for organizing my tasks?', diff --git a/ej2-javascript/grid/getting-started.md b/ej2-javascript/grid/getting-started.md index 4013a9f2f..58260d9aa 100644 --- a/ej2-javascript/grid/getting-started.md +++ b/ej2-javascript/grid/getting-started.md @@ -32,11 +32,7 @@ Following is the list of minimum dependencies required to use the grid. ## Setup for local development -<<<<<<< HEAD -Clone the Essential® JS 2 quickstart application project from [GitHub](https://github.com/syncfusion/ej2-quickstart.git), and install the necessary npm packages using the following command line scripts. -======= Clone the Essential JS 2 quickstart application project from [GitHub](https://github.com/syncfusion/ej2-quickstart), and install the necessary npm packages using the following command line scripts. ->>>>>>> dffb264cd8572d95b7b8d4750a807381c4a16357 ``` git clone https://github.com/syncfusion/ej2-quickstart.git quickstart diff --git a/ej2-typescript-toc.html b/ej2-typescript-toc.html index b35518124..aa0c48656 100644 --- a/ej2-typescript-toc.html +++ b/ej2-typescript-toc.html @@ -179,12 +179,9 @@
  • Azure Open AI
    • -<<<<<<< HEAD -=======
  • Ollama LLM
    • ->>>>>>> 5e0432fe790d22c521f22d2e5b323e0fb8b8fb04
  • Toolbar items