From: hjnim.kim <hjnim.kim@samsung.com>
Date: Sat, 6 Apr 2013 06:08:49 +0000 (+0900)
Subject: Tizenwinset: popup script has been removed
X-Git-Tag: accepted/tizen_2.1/20130425.023924~2^2~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d48e2547b1b95effa454cf9dec85b83e4dca3fb;p=platform%2Fframework%2Fweb%2Fweb-ui-fw.git

Tizenwinset: popup script has been removed

popup javascript has been removed in popup sample
N_SE-32424

Change-Id: I7829a81427d2d0ea9210508ddb970a7bb9e840f7
---

diff --git a/demos/tizen-winsets/widgets/popupwindow/popup.html b/demos/tizen-winsets/widgets/popupwindow/popup.html
index dbf3579..27acf9a 100644
--- a/demos/tizen-winsets/widgets/popupwindow/popup.html
+++ b/demos/tizen-winsets/widgets/popupwindow/popup.html
@@ -309,7 +309,7 @@
 			</div>
 			<div class="ui-popup-button-bg">
 				<a data-role="button" data-rel="back" data-inline="true">OK</a>
-				<a data-role="button" id="btn_textbox_popup_cancel" data-rel="back" data-inline="true">Cancel</a>
+				<a data-role="button" id="btn_textbox_popup_cancel" data-inline="true">Cancel</a>
 			</div>
 		</div>
 
@@ -318,10 +318,9 @@
 		</div>
 
 	</div> <!-- /content -->
-
+	<script src="popupwindow.js"></script>
 	<div data-role="footer">
 	</div>
-	<script src="popupwindow.js"></script>
 </div> <!-- /page -->
 
 </body>
diff --git a/demos/tizen-winsets/widgets/popupwindow/popupwindow.js b/demos/tizen-winsets/widgets/popupwindow/popupwindow.js
index b7d3e81..0e33b0e 100644
--- a/demos/tizen-winsets/widgets/popupwindow/popupwindow.js
+++ b/demos/tizen-winsets/widgets/popupwindow/popupwindow.js
@@ -1,9 +1,6 @@
-$( document ).one( "pagecreate", "#popupwindow-demo", function () {
-	$('input[name="popupwindow-demo-transition-choice"]').on("change", function ( e ) {
-		$("#popupContent2").popupwindow("option", "transition", $(this).attr("id").split("-").pop());
-	});
-
+$( document ).one( "pageinit", "#popupwindow-demo", function () {
 	$("#btn_textbox_popup_cancel").on("vclick", function ( ev ) {
 		$("#textbox_popup").find("input").val("");
+		$("#textbox_popup").popup("close");
 	});
 });