Merge branch 'master' into tizen_2.2

Change-Id: I4c152ad4eab8af4ed65a4cdbb77f85992394796d

diff --git a/packaging/TizenWinset.changes b/packaging/TizenWinset.changes
new file mode 100644 (file)
index 0000000..26b0249
--- /dev/null
+++ b/packaging/TizenWinset.changes
@@ -0,0 +1,2 @@
+- 0.2.42 Sync
+

diff --git a/packaging/TizenWinset.spec b/packaging/TizenWinset.spec
new file mode 100644 (file)
index 0000000..88f7ce3
--- /dev/null
+++ b/packaging/TizenWinset.spec
@@ -0,0 +1,22 @@
+Name:       TizenWinset
+Version:    0.2.42
+Release:    0
+Summary:    Tizen Web UI Framework Sample App
+Group:      Development/Other
+License:    MIT
+
+%description
+Tizen Web UI Framework sample application
+
+%changelog
+* Mon Jun 24 2013 Hyunjung Kim <hjnim.kim@samsung.com> 0.2.42
+       - Sync : Tizen Web UI Framework 0.2.42
+
+* Sun Jun 23 2013 Hyunjung Kim <hjnim.kim@samsung.com> 0.2.40
+       - Sync : Tizen Web UI Framework 0.2.40
+
+* Fri Jun 21 2013 Hyunjung Kim <hjnim.kim@samsung.com> 0.2.39
+       - Sync : Tizen Web UI Framework 0.2.39
+
+* Sun Jun 16 2013 Hyunjung Kim <hjnim.kim@samsung.com> 0.2.37
+       - Sync : Tizen Web UI Framework 0.2.37

diff --git a/tips/generate-elements-dynamically/generate-elements-dynamically.html b/tips/generate-elements-dynamically/generate-elements-dynamically.html
index 3355585..069e350 100644 (file)
--- a/tips/generate-elements-dynamically/generate-elements-dynamically.html
+++ b/tips/generate-elements-dynamically/generate-elements-dynamically.html
@@ -33,9 +33,7 @@
                                        $( "#checkboxItems" ).append( newhtml).trigger( "create" );<br>
                                </p>
                        </div>
-       
                        <div id="checkboxItems" ></div>
-       
                        <fieldset class="ui-grid-b">
                                <div data-role="controlgroup" data-type="horizontal">
                                        <a id="bAdd" href="#" data-role="button" data-icon="plus" >Add new item</a>
@@ -55,7 +53,6 @@
                                        /* Append new button */<br>
                                        var buttonTemplate = "&ltdiv data-role='button' data-inline='true' " + "data-icon='call' data-style='circle' " + "data-theme='s' class='newbutton'&gt&lt/div&gt"; <br>
                                        $( buttonTemplate ).buttonMarkup().appendTo( "#buttonItems" ); <br><br>
-                                       
                                        /* It's same to call ".buttonMarkup()". */<br>
                                        $( "#buttonItems" ).trigger( "create" );
                                </p>

diff --git a/webappInit.js b/webappInit.js
index 5f0cdd2..ea502a4 100644 (file)
--- a/webappInit.js
+++ b/webappInit.js
@@ -1,6 +1,6 @@
 $(document).on( "pageinit", "#main" , function () {
        if ( window.tizen && window.tizen.application ) {
-               $( "#main .ui-btn-back" ).on( "vclick", function () {
+               $( "#main .ui-btn-back" ).on( "click", function () {
                        window.tizen.application.getCurrentApplication().exit();
                        return false;
                });