aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-29 00:04:06 -0700
committerfriendica <info@friendica.com>2014-03-29 00:04:06 -0700
commit7ed177c7cde9e987c18d3f0c0b5b3fc6e371c814 (patch)
treec619ecb923ddd9643e467f6aa48243a787159720
parent86ec665565059a6db97d598ebb7c9dba94f96d56 (diff)
downloadvolse-hubzilla-7ed177c7cde9e987c18d3f0c0b5b3fc6e371c814.tar.gz
volse-hubzilla-7ed177c7cde9e987c18d3f0c0b5b3fc6e371c814.tar.bz2
volse-hubzilla-7ed177c7cde9e987c18d3f0c0b5b3fc6e371c814.zip
check that aside actually exists before querying the html length
-rw-r--r--assets/home.html2
-rw-r--r--version.inc2
-rw-r--r--view/theme/redbasic/js/redbasic.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/assets/home.html b/assets/home.html
index fa0d8b3bc..0eaafb678 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -164,7 +164,7 @@ $(document).ready(function() {
<img style="width: 450px; margin-bottom: 30px;" src="assets/logo_simplifiedap.png" >
<div style="color:#808080;font-weight:bold;font-size:3.0em; margin-bottom:30px;">Dream it. Do it.</div>
<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
-The RedMatrix (aka "red") is a highly advanced social networking platform which was created by a <a style="color: #555;" href="#" class="cb">farmer in Australia</a> - that grew disgusted by the lack of privacy and the increasing tendency of foreign corporations and governments to monitor and control the internet. This has strangled and subverted all that was once good about the web - and turned it into a "steaming pile of crap". (Aussies typically don't mince words.)
+The RedMatrix (aka "red") is an advanced social networking platform which was created by a <a style="color: #555;" href="#" class="cb">farmer in Australia</a> - who grew disgusted by the lack of privacy and the increasing tendency of foreign corporations and governments to monitor and control the internet. This has strangled and subverted all that was once good about the web - and turned it into a "steaming pile of crap". (Aussies typically don't mince words.)
</div>
<br />
<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
diff --git a/version.inc b/version.inc
index 5dce4085a..080731a40 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-03-28.630
+2014-03-29.631
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 70869f44b..0aab42cd5 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -25,7 +25,7 @@ $('#expand-aside').click(function() {
$('main').toggleClass('region_1-on');
});
-if ($('aside').html().length == 0) {
+if($('aside').length && $('aside').html().length == 0) {
$('#expand-aside').hide();
}