aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-07-20 17:17:08 -0700
committerFriendika <info@friendika.com>2011-07-20 17:17:08 -0700
commit530722568281188f262c5da5fcc8020528f1a3ac (patch)
treef3f0fbdacd3c5beeb949f4a00e899c3c970a50f4
parent40092c83a5568a9896c05f7ccdd8da4649f5271a (diff)
downloadvolse-hubzilla-530722568281188f262c5da5fcc8020528f1a3ac.tar.gz
volse-hubzilla-530722568281188f262c5da5fcc8020528f1a3ac.tar.bz2
volse-hubzilla-530722568281188f262c5da5fcc8020528f1a3ac.zip
ajax pause - any key to resume
-rw-r--r--boot.php2
-rw-r--r--include/main.js8
2 files changed, 9 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 7effe3087..61585419a 100644
--- a/boot.php
+++ b/boot.php
@@ -1,6 +1,6 @@
<?php
-define ( 'FRIENDIKA_VERSION', '2.2.1046' );
+define ( 'FRIENDIKA_VERSION', '2.2.1047' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1076 );
diff --git a/include/main.js b/include/main.js
index 040e9695e..288fd6f01 100644
--- a/include/main.js
+++ b/include/main.js
@@ -100,6 +100,14 @@
$('#pause').html('');
}
}
+ else {
+ // any key to resume
+ if(stopped == true) {
+ stopped = false;
+ $('#pause').html('');
+ }
+ }
+
});
});