ide-assi 0.455.0 → 0.456.0

package/dist/bundle.cjs.js

@@ -202221,8 +202221,10 @@ class IdeAi
 		else {
 			controllerSrc = src.controller;
 		}
+
+		let jsSrc;
 		if (apply.javascript) {
-			await this.#generateTmplFile("/prompts/meta/U.BuildReactJsx.txt", "react.jsx", {
+			jsSrc = await this.#generateTmplFile("/prompts/meta/U.BuildReactJsx.txt", "react.jsx", {
 				userPrompt: userPrompt,
 				mybatis: srcPath.mybatis,
 				originSrc: src.javascript,
@@ -202236,12 +202238,32 @@ class IdeAi
 			progressMessageInstance.updateProgress('javascript', 'completed');
 		}
 		else {
-			src.javascript;
+			jsSrc = src.javascript;
 		}
-		//console.log(src.javascript);
-		//progressMessageInstance.updateProgress('javascript', 'completed');
 
-		await this.#generateRealFile(srcPath, apply);
+		//await this.#generateRealFile(srcPath, apply);
+
+		const returnSrc = [];
+
+		const mapping = {
+			mybatis: mybatisXmlSource,
+			service: serviceSrc,
+			controller: controllerSrc,
+			javascript: jsSrc
+		};
+
+		for (const key in apply) {
+			if (apply[key]) {
+				returnSrc.push({
+					[key]: {
+						asis: src[key],
+						tobe: mapping[key]
+					}
+				});
+			}
+		}
+
+		return returnSrc;
 	};
 
 	generateSourceClient = async (userPrompt, apply) => {
@@ -202301,13 +202323,11 @@ class IdeAi
 		if (what === "1") {
 			if (!apply.mybatis || !apply.service || !apply.controller || !apply.javascript) ;
 			//await this.#createSource(userPrompt, apply);
-			await this.#modifySource(userPrompt, apply, progressMessageInstance);
+			return await this.#modifySource(userPrompt, apply, progressMessageInstance);
 		}
 		else if (what === "2") {
-			await this.#modifySource(userPrompt, apply, progressMessageInstance);
+			return await this.#modifySource(userPrompt, apply, progressMessageInstance);
 		}
-
-		return "OK";
 	}
 
 
@@ -202545,52 +202565,15 @@ class IdeAssi extends HTMLElement
 		const elAiChat = this.shadowRoot.querySelector("nx-ai-chat");
 
 
-		/**
-		// 1. 초기 진행 상태 메시지 추가
-		const initialProgressData = [
-			{ id: 'analysis', message: '분석중입니다.', completedMessage: '분석이 완료되었습니다.' },
-			{ id: 'design', message: '설계중.', completedMessage: '설계가 완료되었습니다.' },
-			{ id: 'development', message: '개발중.', completedMessage: '개발이 완료되었습니다.' }
-		];
-
-// aiChat.add 호출 시, progressData를 마지막 인자로 전달하고 생성된 엘리먼트를 받습니다.
-		const progressMessageInstance = elAiChat.addProgress(initialProgressData);
-
-// 2. 시간이 지난 후, 특정 단계의 완료를 알림
-// 예를 들어, 3초 후에 분석 완료
-		setTimeout(() => {
-			if (progressMessageInstance) {
-				progressMessageInstance.updateProgress('analysis', 'completed');
-				console.log("분석 완료 메시지 업데이트");
-			}
-		}, 3000);
-
-// 예를 들어, 6초 후에 설계 완료
-		setTimeout(() => {
-			if (progressMessageInstance) {
-				progressMessageInstance.updateProgress('design', 'completed');
-				console.log("설계 완료 메시지 업데이트");
-			}
-		}, 6000);
-
-// 모든 단계가 완료된 후, 일반 AI 메시지 추가 (선택 사항)
-		setTimeout(() => {
-			elAiChat.add("ai", "모든 작업이 성공적으로 완료되었습니다!", [], []);
-		}, 9000);
-
-		this.#ing = false;
-
-		return;
-			*/
-
-
 		elAiChat.add("me", userPrompt);
 		elAiChat.add("ing", "...");
 
 
 		try {
-			const r = await this.#ai.generateSourceClient(userPrompt, apply);
-			//elAiChat.add("ai", r);
+			const changedSource = await this.#ai.generateSourceClient(userPrompt, apply);
+			if (changedSource) {
+				this.shadowRoot.querySelector("ide-diff-popup").popup(changedSource);
+			}
 		} catch (error) {
 			console.error(error);
 			elAiChat.add("ai", String(error).replace("Error:", ""));
@@ -202794,10 +202777,16 @@ class IdeDiffPopup extends HTMLElement
 			
 			<nx-dialog>
 				<nx-tab theme="theme-4" ref={tabRef}>
-				  <nx-tab-page caption="1">
+				  <nx-tab-page caption="mybatis">
+					<ide-diff></ide-diff>
+				  </nx-tab-page>
+				  <nx-tab-page caption="service">
 					<ide-diff></ide-diff>
 				  </nx-tab-page>
-				  <nx-tab-page caption="2">
+				  <nx-tab-page caption="controller">
+					<ide-diff></ide-diff>
+				  </nx-tab-page>
+				  <nx-tab-page caption="javascript">
 					<ide-diff></ide-diff>
 				  </nx-tab-page>
 				</nx-tab>
@@ -202805,17 +202794,24 @@ class IdeDiffPopup extends HTMLElement
 		`;
 	}
 	
-	popup = (src1, src2) => {
+	popup = (chagedSource) => {
 		setTimeout(() => {
-			const target = ninegrid.querySelector("ide-diff", this.shadowRoot);
-			console.log(target);
-			target.initialize(src1, src2);
-			this.shadowRoot.querySelector('dialog').showModal();
+			for (const key in chagedSource) {
+				const tabPage = this.shadowRoot.querySelector(`nx-tab-page[caption='${key}']`);
+				if (!tabPage) continue;
+
+				const diff = tabPage.querySelector("ide-diff");
+				if (!diff) continue;
+
+				diff.initialize(chagedSource[key].asis, chagedSource[key].tobe, ninegrid.decode(key, "mybatis", "xml", "javascript", "javascript", "java"));
+			}
+
+			this.shadowRoot.querySelector('nx-dialog')?.showModal();
 		}, 100);
+
 	};
 }
 
-
 customElements.define("ide-diff-popup", IdeDiffPopup);
 
 // These are filled with ranges (rangeFrom[i] up to but not including
@@ -235640,6 +235636,9 @@ class IdeDiff extends HTMLElement {
 			return;
 		}
 
+
+		console.log(language);
+
 		this.#isScrollSyncActive = false;
 
 		let langExtension;

package/dist/bundle.esm.js

@@ -202217,8 +202217,10 @@ class IdeAi
 		else {
 			controllerSrc = src.controller;
 		}
+
+		let jsSrc;
 		if (apply.javascript) {
-			await this.#generateTmplFile("/prompts/meta/U.BuildReactJsx.txt", "react.jsx", {
+			jsSrc = await this.#generateTmplFile("/prompts/meta/U.BuildReactJsx.txt", "react.jsx", {
 				userPrompt: userPrompt,
 				mybatis: srcPath.mybatis,
 				originSrc: src.javascript,
@@ -202232,12 +202234,32 @@ class IdeAi
 			progressMessageInstance.updateProgress('javascript', 'completed');
 		}
 		else {
-			src.javascript;
+			jsSrc = src.javascript;
 		}
-		//console.log(src.javascript);
-		//progressMessageInstance.updateProgress('javascript', 'completed');
 
-		await this.#generateRealFile(srcPath, apply);
+		//await this.#generateRealFile(srcPath, apply);
+
+		const returnSrc = [];
+
+		const mapping = {
+			mybatis: mybatisXmlSource,
+			service: serviceSrc,
+			controller: controllerSrc,
+			javascript: jsSrc
+		};
+
+		for (const key in apply) {
+			if (apply[key]) {
+				returnSrc.push({
+					[key]: {
+						asis: src[key],
+						tobe: mapping[key]
+					}
+				});
+			}
+		}
+
+		return returnSrc;
 	};
 
 	generateSourceClient = async (userPrompt, apply) => {
@@ -202297,13 +202319,11 @@ class IdeAi
 		if (what === "1") {
 			if (!apply.mybatis || !apply.service || !apply.controller || !apply.javascript) ;
 			//await this.#createSource(userPrompt, apply);
-			await this.#modifySource(userPrompt, apply, progressMessageInstance);
+			return await this.#modifySource(userPrompt, apply, progressMessageInstance);
 		}
 		else if (what === "2") {
-			await this.#modifySource(userPrompt, apply, progressMessageInstance);
+			return await this.#modifySource(userPrompt, apply, progressMessageInstance);
 		}
-
-		return "OK";
 	}
 
 
@@ -202541,52 +202561,15 @@ class IdeAssi extends HTMLElement
 		const elAiChat = this.shadowRoot.querySelector("nx-ai-chat");
 
 
-		/**
-		// 1. 초기 진행 상태 메시지 추가
-		const initialProgressData = [
-			{ id: 'analysis', message: '분석중입니다.', completedMessage: '분석이 완료되었습니다.' },
-			{ id: 'design', message: '설계중.', completedMessage: '설계가 완료되었습니다.' },
-			{ id: 'development', message: '개발중.', completedMessage: '개발이 완료되었습니다.' }
-		];
-
-// aiChat.add 호출 시, progressData를 마지막 인자로 전달하고 생성된 엘리먼트를 받습니다.
-		const progressMessageInstance = elAiChat.addProgress(initialProgressData);
-
-// 2. 시간이 지난 후, 특정 단계의 완료를 알림
-// 예를 들어, 3초 후에 분석 완료
-		setTimeout(() => {
-			if (progressMessageInstance) {
-				progressMessageInstance.updateProgress('analysis', 'completed');
-				console.log("분석 완료 메시지 업데이트");
-			}
-		}, 3000);
-
-// 예를 들어, 6초 후에 설계 완료
-		setTimeout(() => {
-			if (progressMessageInstance) {
-				progressMessageInstance.updateProgress('design', 'completed');
-				console.log("설계 완료 메시지 업데이트");
-			}
-		}, 6000);
-
-// 모든 단계가 완료된 후, 일반 AI 메시지 추가 (선택 사항)
-		setTimeout(() => {
-			elAiChat.add("ai", "모든 작업이 성공적으로 완료되었습니다!", [], []);
-		}, 9000);
-
-		this.#ing = false;
-
-		return;
-			*/
-
-
 		elAiChat.add("me", userPrompt);
 		elAiChat.add("ing", "...");
 
 
 		try {
-			const r = await this.#ai.generateSourceClient(userPrompt, apply);
-			//elAiChat.add("ai", r);
+			const changedSource = await this.#ai.generateSourceClient(userPrompt, apply);
+			if (changedSource) {
+				this.shadowRoot.querySelector("ide-diff-popup").popup(changedSource);
+			}
 		} catch (error) {
 			console.error(error);
 			elAiChat.add("ai", String(error).replace("Error:", ""));
@@ -202790,10 +202773,16 @@ class IdeDiffPopup extends HTMLElement
 			
 			<nx-dialog>
 				<nx-tab theme="theme-4" ref={tabRef}>
-				  <nx-tab-page caption="1">
+				  <nx-tab-page caption="mybatis">
+					<ide-diff></ide-diff>
+				  </nx-tab-page>
+				  <nx-tab-page caption="service">
 					<ide-diff></ide-diff>
 				  </nx-tab-page>
-				  <nx-tab-page caption="2">
+				  <nx-tab-page caption="controller">
+					<ide-diff></ide-diff>
+				  </nx-tab-page>
+				  <nx-tab-page caption="javascript">
 					<ide-diff></ide-diff>
 				  </nx-tab-page>
 				</nx-tab>
@@ -202801,17 +202790,24 @@ class IdeDiffPopup extends HTMLElement
 		`;
 	}
 	
-	popup = (src1, src2) => {
+	popup = (chagedSource) => {
 		setTimeout(() => {
-			const target = ninegrid.querySelector("ide-diff", this.shadowRoot);
-			console.log(target);
-			target.initialize(src1, src2);
-			this.shadowRoot.querySelector('dialog').showModal();
+			for (const key in chagedSource) {
+				const tabPage = this.shadowRoot.querySelector(`nx-tab-page[caption='${key}']`);
+				if (!tabPage) continue;
+
+				const diff = tabPage.querySelector("ide-diff");
+				if (!diff) continue;
+
+				diff.initialize(chagedSource[key].asis, chagedSource[key].tobe, ninegrid.decode(key, "mybatis", "xml", "javascript", "javascript", "java"));
+			}
+
+			this.shadowRoot.querySelector('nx-dialog')?.showModal();
 		}, 100);
+
 	};
 }
 
-
 customElements.define("ide-diff-popup", IdeDiffPopup);
 
 // These are filled with ranges (rangeFrom[i] up to but not including
@@ -235636,6 +235632,9 @@ class IdeDiff extends HTMLElement {
 			return;
 		}
 
+
+		console.log(language);
+
 		this.#isScrollSyncActive = false;
 
 		let langExtension;

package/dist/components/ideAi.js

@@ -516,10 +516,30 @@ export class IdeAi
 		else {
 			jsSrc = src.javascript;
 		}
-		//console.log(src.javascript);
-		//progressMessageInstance.updateProgress('javascript', 'completed');
 
-		await this.#generateRealFile(srcPath, apply);
+		//await this.#generateRealFile(srcPath, apply);
+
+		const returnSrc = [];
+
+		const mapping = {
+			mybatis: mybatisXmlSource,
+			service: serviceSrc,
+			controller: controllerSrc,
+			javascript: jsSrc
+		};
+
+		for (const key in apply) {
+			if (apply[key]) {
+				returnSrc.push({
+					[key]: {
+						asis: src[key],
+						tobe: mapping[key]
+					}
+				});
+			}
+		}
+
+		return returnSrc;
 	};
 
 	generateSourceClient = async (userPrompt, apply) => {
@@ -581,13 +601,11 @@ export class IdeAi
 				//return "소스 생성하실려면 변경대상 소스를 모두 선택하세요.";
 			}
 			//await this.#createSource(userPrompt, apply);
-			await this.#modifySource(userPrompt, apply, progressMessageInstance);
+			return await this.#modifySource(userPrompt, apply, progressMessageInstance);
 		}
 		else if (what === "2") {
-			await this.#modifySource(userPrompt, apply, progressMessageInstance);
+			return await this.#modifySource(userPrompt, apply, progressMessageInstance);
 		}
-
-		return "OK";
 	}
 
 

package/dist/components/ideAssi.js

@@ -533,52 +533,15 @@ export default DocManager;
 		const elAiChat = this.shadowRoot.querySelector("nx-ai-chat");
 
 
-		/**
-		// 1. 초기 진행 상태 메시지 추가
-		const initialProgressData = [
-			{ id: 'analysis', message: '분석중입니다.', completedMessage: '분석이 완료되었습니다.' },
-			{ id: 'design', message: '설계중.', completedMessage: '설계가 완료되었습니다.' },
-			{ id: 'development', message: '개발중.', completedMessage: '개발이 완료되었습니다.' }
-		];
-
-// aiChat.add 호출 시, progressData를 마지막 인자로 전달하고 생성된 엘리먼트를 받습니다.
-		const progressMessageInstance = elAiChat.addProgress(initialProgressData);
-
-// 2. 시간이 지난 후, 특정 단계의 완료를 알림
-// 예를 들어, 3초 후에 분석 완료
-		setTimeout(() => {
-			if (progressMessageInstance) {
-				progressMessageInstance.updateProgress('analysis', 'completed');
-				console.log("분석 완료 메시지 업데이트");
-			}
-		}, 3000);
-
-// 예를 들어, 6초 후에 설계 완료
-		setTimeout(() => {
-			if (progressMessageInstance) {
-				progressMessageInstance.updateProgress('design', 'completed');
-				console.log("설계 완료 메시지 업데이트");
-			}
-		}, 6000);
-
-// 모든 단계가 완료된 후, 일반 AI 메시지 추가 (선택 사항)
-		setTimeout(() => {
-			elAiChat.add("ai", "모든 작업이 성공적으로 완료되었습니다!", [], []);
-		}, 9000);
-
-		this.#ing = false;
-
-		return;
-			*/
-
-
 		elAiChat.add("me", userPrompt);
 		elAiChat.add("ing", "...");
 
 
 		try {
-			const r = await this.#ai.generateSourceClient(userPrompt, apply);
-			//elAiChat.add("ai", r);
+			const changedSource = await this.#ai.generateSourceClient(userPrompt, apply);
+			if (changedSource) {
+				this.shadowRoot.querySelector("ide-diff-popup").popup(changedSource);
+			}
 		} catch (error) {
 			console.error(error);
 			elAiChat.add("ai", String(error).replace("Error:", ""));

package/dist/components/ideDiff.js

@@ -464,6 +464,9 @@ export class IdeDiff extends HTMLElement {
 			return;
 		}
 
+
+		console.log(language);
+
 		this.#isScrollSyncActive = false;
 
 		let langExtension;

package/dist/components/ideDiffPopup.js

@@ -20,10 +20,16 @@ class IdeDiffPopup extends HTMLElement
 			
 			<nx-dialog>
 				<nx-tab theme="theme-4" ref={tabRef}>
-				  <nx-tab-page caption="1">
+				  <nx-tab-page caption="mybatis">
 					<ide-diff></ide-diff>
 				  </nx-tab-page>
-				  <nx-tab-page caption="2">
+				  <nx-tab-page caption="service">
+					<ide-diff></ide-diff>
+				  </nx-tab-page>
+				  <nx-tab-page caption="controller">
+					<ide-diff></ide-diff>
+				  </nx-tab-page>
+				  <nx-tab-page caption="javascript">
 					<ide-diff></ide-diff>
 				  </nx-tab-page>
 				</nx-tab>
@@ -31,16 +37,22 @@ class IdeDiffPopup extends HTMLElement
 		`;
 	}
 	
-	popup = (src1, src2) => {
+	popup = (chagedSource) => {
 		setTimeout(() => {
-			const target = ninegrid.querySelector("ide-diff", this.shadowRoot);
-			console.log(target);
-			target.initialize(src1, src2);
-			this.shadowRoot.querySelector('dialog').showModal();
+			for (const key in chagedSource) {
+				const tabPage = this.shadowRoot.querySelector(`nx-tab-page[caption='${key}']`);
+				if (!tabPage) continue;
+
+				const diff = tabPage.querySelector("ide-diff");
+				if (!diff) continue;
+
+				diff.initialize(chagedSource[key].asis, chagedSource[key].tobe, ninegrid.decode(key, "mybatis", "xml", "javascript", "javascript", "java"));
+			}
+
+			this.shadowRoot.querySelector('nx-dialog')?.showModal();
 		}, 100);
+
 	};
 }
 
-
 customElements.define("ide-diff-popup", IdeDiffPopup);
-

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ide-assi",
   "type": "module",
-  "version": "0.455.0",
+  "version": "0.456.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {

package/src/components/ideAi.js

@@ -516,10 +516,30 @@ export class IdeAi
 		else {
 			jsSrc = src.javascript;
 		}
-		//console.log(src.javascript);
-		//progressMessageInstance.updateProgress('javascript', 'completed');
 
-		await this.#generateRealFile(srcPath, apply);
+		//await this.#generateRealFile(srcPath, apply);
+
+		const returnSrc = [];
+
+		const mapping = {
+			mybatis: mybatisXmlSource,
+			service: serviceSrc,
+			controller: controllerSrc,
+			javascript: jsSrc
+		};
+
+		for (const key in apply) {
+			if (apply[key]) {
+				returnSrc.push({
+					[key]: {
+						asis: src[key],
+						tobe: mapping[key]
+					}
+				});
+			}
+		}
+
+		return returnSrc;
 	};
 
 	generateSourceClient = async (userPrompt, apply) => {
@@ -581,13 +601,11 @@ export class IdeAi
 				//return "소스 생성하실려면 변경대상 소스를 모두 선택하세요.";
 			}
 			//await this.#createSource(userPrompt, apply);
-			await this.#modifySource(userPrompt, apply, progressMessageInstance);
+			return await this.#modifySource(userPrompt, apply, progressMessageInstance);
 		}
 		else if (what === "2") {
-			await this.#modifySource(userPrompt, apply, progressMessageInstance);
+			return await this.#modifySource(userPrompt, apply, progressMessageInstance);
 		}
-
-		return "OK";
 	}
 
 

package/src/components/ideAssi.js

@@ -533,52 +533,15 @@ export default DocManager;
 		const elAiChat = this.shadowRoot.querySelector("nx-ai-chat");
 
 
-		/**
-		// 1. 초기 진행 상태 메시지 추가
-		const initialProgressData = [
-			{ id: 'analysis', message: '분석중입니다.', completedMessage: '분석이 완료되었습니다.' },
-			{ id: 'design', message: '설계중.', completedMessage: '설계가 완료되었습니다.' },
-			{ id: 'development', message: '개발중.', completedMessage: '개발이 완료되었습니다.' }
-		];
-
-// aiChat.add 호출 시, progressData를 마지막 인자로 전달하고 생성된 엘리먼트를 받습니다.
-		const progressMessageInstance = elAiChat.addProgress(initialProgressData);
-
-// 2. 시간이 지난 후, 특정 단계의 완료를 알림
-// 예를 들어, 3초 후에 분석 완료
-		setTimeout(() => {
-			if (progressMessageInstance) {
-				progressMessageInstance.updateProgress('analysis', 'completed');
-				console.log("분석 완료 메시지 업데이트");
-			}
-		}, 3000);
-
-// 예를 들어, 6초 후에 설계 완료
-		setTimeout(() => {
-			if (progressMessageInstance) {
-				progressMessageInstance.updateProgress('design', 'completed');
-				console.log("설계 완료 메시지 업데이트");
-			}
-		}, 6000);
-
-// 모든 단계가 완료된 후, 일반 AI 메시지 추가 (선택 사항)
-		setTimeout(() => {
-			elAiChat.add("ai", "모든 작업이 성공적으로 완료되었습니다!", [], []);
-		}, 9000);
-
-		this.#ing = false;
-
-		return;
-			*/
-
-
 		elAiChat.add("me", userPrompt);
 		elAiChat.add("ing", "...");
 
 
 		try {
-			const r = await this.#ai.generateSourceClient(userPrompt, apply);
-			//elAiChat.add("ai", r);
+			const changedSource = await this.#ai.generateSourceClient(userPrompt, apply);
+			if (changedSource) {
+				this.shadowRoot.querySelector("ide-diff-popup").popup(changedSource);
+			}
 		} catch (error) {
 			console.error(error);
 			elAiChat.add("ai", String(error).replace("Error:", ""));

package/src/components/ideDiff.js

@@ -464,6 +464,9 @@ export class IdeDiff extends HTMLElement {
 			return;
 		}
 
+
+		console.log(language);
+
 		this.#isScrollSyncActive = false;
 
 		let langExtension;

package/src/components/ideDiffPopup.js

@@ -20,10 +20,16 @@ class IdeDiffPopup extends HTMLElement
 			
 			<nx-dialog>
 				<nx-tab theme="theme-4" ref={tabRef}>
-				  <nx-tab-page caption="1">
+				  <nx-tab-page caption="mybatis">
 					<ide-diff></ide-diff>
 				  </nx-tab-page>
-				  <nx-tab-page caption="2">
+				  <nx-tab-page caption="service">
+					<ide-diff></ide-diff>
+				  </nx-tab-page>
+				  <nx-tab-page caption="controller">
+					<ide-diff></ide-diff>
+				  </nx-tab-page>
+				  <nx-tab-page caption="javascript">
 					<ide-diff></ide-diff>
 				  </nx-tab-page>
 				</nx-tab>
@@ -31,16 +37,22 @@ class IdeDiffPopup extends HTMLElement
 		`;
 	}
 	
-	popup = (src1, src2) => {
+	popup = (chagedSource) => {
 		setTimeout(() => {
-			const target = ninegrid.querySelector("ide-diff", this.shadowRoot);
-			console.log(target);
-			target.initialize(src1, src2);
-			this.shadowRoot.querySelector('dialog').showModal();
+			for (const key in chagedSource) {
+				const tabPage = this.shadowRoot.querySelector(`nx-tab-page[caption='${key}']`);
+				if (!tabPage) continue;
+
+				const diff = tabPage.querySelector("ide-diff");
+				if (!diff) continue;
+
+				diff.initialize(chagedSource[key].asis, chagedSource[key].tobe, ninegrid.decode(key, "mybatis", "xml", "javascript", "javascript", "java"));
+			}
+
+			this.shadowRoot.querySelector('nx-dialog')?.showModal();
 		}, 100);
+
 	};
 }
 
-
 customElements.define("ide-diff-popup", IdeDiffPopup);
-