Merge branch 'master' into tizen_2.1

diff --git a/demos/tizen-winsets/widgets/popupwindow/popupwindow.js b/demos/tizen-winsets/widgets/popupwindow/popupwindow.js
index b7d3e81..a4fead0 100644 (file)
--- a/demos/tizen-winsets/widgets/popupwindow/popupwindow.js
+++ b/demos/tizen-winsets/widgets/popupwindow/popupwindow.js
@@ -1,9 +1,13 @@
-$( 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());
-       });
-
-       $("#btn_textbox_popup_cancel").on("vclick", function ( ev ) {
-               $("#textbox_popup").find("input").val("");
-       });
+$("#popupwindow-demo").bind("pageshow", function() {
+      $('#popupwindow-demo-transition-' + $("#popupContent2").popupwindow("option", "transition"))
+        .attr("checked", "true")
+        .checkboxradio("refresh");
+
+       $(this).find('#progressbar').progressbar('start');
+});
+
+$('input[name=popupwindow-demo-transition-choice]').bind("change", function(e) {
+      $("#popupContent2").popupwindow("option", "transition", $(this).attr("id").split("-").pop());
 });
+
+

diff --git a/demos/tizen-winsets/widgets/radio/radio.js b/demos/tizen-winsets/widgets/radio/radio.js
index 3498bae..2c97312 100644 (file)
--- a/demos/tizen-winsets/widgets/radio/radio.js
+++ b/demos/tizen-winsets/widgets/radio/radio.js
@@ -1,8 +1,7 @@
-$( document ).one( "pagecreate", "#radio-demo", function () {
-       $("input[type='radio']").on( "change", function (event, ui) {
-               if ( this.checked ) {
+$( "#radio-demo" ).live("pagecreate", function () {
+       $("input[type='radio']").bind( "change", function(event, ui) {
+               if( this.checked )
                        $( ".triggered-radio" ).text( this.id + " is selected..." );
-               }
        });
 
 });

diff --git a/src/js/widgets/jquery.mobile.tizen.tokentextarea.js b/src/js/widgets/jquery.mobile.tizen.tokentextarea.js
old mode 100755 (executable)
new mode 100644 (file)