Merge branch 'master' into activesync_2_9_0

Conflicts: framework/ActiveSync/package.xml
horde · Oct 22, 2013 · 88187a7 · 88187a7
2 parents 2d697fd + 851160d
commit 88187a7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/framework/ActiveSync/package.xml b/framework/ActiveSync/package.xml
@@ -10,9 +10,9 @@
   <email>mrubinsk@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2013-10-15</date>
+ <date>2013-10-22</date>
  <version>
-  <release>2.8.5</release>
+  <release>2.8.6</release>
   <api>2.8.0</api>
  </version>
  <stability>
@@ -1787,11 +1787,24 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-10-15</date>
+   <date>2013-10-22</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
 * [mjr] Improve performance related to conflict detection and change mirroring protection.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>2.8.6</release>
+    <api>2.8.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2013-10-22</date>
+   <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
+   <notes>
+*
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/kronolith/js/smartmobile.js b/kronolith/js/smartmobile.js
@@ -777,13 +777,13 @@ var KronolithMobile = {
         });
 
         // Bind click and swipe events
-        $('body').bind('swipeleft', KronolithMobile.handleSwipe);
-        $('body').bind('swiperight', KronolithMobile.handleSwipe);
-        $(document).bind('pageshow', KronolithMobile.loadPage);
-        $(document).bind('pagebeforechange', KronolithMobile.toPage);
-        $("#eventview").live("pageshow", function(event, ui) {
-            KronolithMobile.view = "event";
-        });
+        $('body').bind('swipeleft', KronolithMobile.handleSwipe)
+            .bind('swiperight', KronolithMobile.handleSwipe);
+        $(document).bind('pageshow', KronolithMobile.loadPage)
+            .bind('pagebeforechange', KronolithMobile.toPage)
+            .on("pageshow", "#eventview", function(event, ui) {
+                KronolithMobile.view = "event";
+            });
 
         $('#kronolith-minical').on('click', 'td', function(e) {
             KronolithMobile.selectMonthDay($(e.target).jqmData('date'));