aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xboot.php4
-rwxr-xr-xmod/viewsrc.php7
-rw-r--r--view/theme/dispy-dark/theme.php7
-rw-r--r--view/theme/dispy/theme.php7
4 files changed, 14 insertions, 11 deletions
diff --git a/boot.php b/boot.php
index 3dcb32dfa..e0ab98bde 100755
--- a/boot.php
+++ b/boot.php
@@ -563,6 +563,10 @@ function absurl($path) {
return $path;
}
+function is_ajax() {
+ return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
+}
+
// Primarily involved with database upgrade, but also sets the
// base url for use in cmdline programs which don't have
diff --git a/mod/viewsrc.php b/mod/viewsrc.php
index 94847ec7b..3fa4eaed5 100755
--- a/mod/viewsrc.php
+++ b/mod/viewsrc.php
@@ -25,7 +25,12 @@ function viewsrc_content(&$a) {
);
if(count($r))
- $o .= str_replace("\n",'<br />',$r[0]['body']);
+ if(is_ajax()) {
+ echo str_replace("\n",'<br />',$r[0]['body']);
+ killme();
+ } else {
+ $o .= str_replace("\n",'<br />',$r[0]['body']);
+ }
return $o;
}
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 372757752..cebe9eb4f 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -91,13 +91,13 @@ $(document).ready(function() {
$('.floaterflip').css({
backgroundPosition: '-210px -60px'
});
- $('.search-box').slideDown('fast');
+ $('.search-box').slideUp('fast');
} else {
$('#nav-floater').slideDown('fast');
$('.floaterflip').css({
backgroundPosition: '-190px -60px'
});
- $('.search-box').slideUp('fast');
+ $('.search-box').slideDown('fast');
}
};
// our trigger for the toolbar button
@@ -156,9 +156,6 @@ function dispydark_community_info() {
$a->page['aside_bottom'] = replace_macros($tpl, $aside);
}
-// use our 'default.php' instead of the system-wide one
-$a->page['template'] = "theme/dispy-dark/default";
-
// aside on profile page
if ($a->argv[0] === "profile") {
dispydark_community_info();
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 190872d01..9789fd0fa 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -91,13 +91,13 @@ $(document).ready(function() {
$('.floaterflip').css({
backgroundPosition: '-210px -60px'
});
- $('.search-box').slideDown('fast');
+ $('.search-box').slideUp('fast');
} else {
$('#nav-floater').slideDown('fast');
$('.floaterflip').css({
backgroundPosition: '-190px -60px'
});
- $('.search-box').slideUp('fast');
+ $('.search-box').slideDown('fast');
}
};
// our trigger for the toolbar button
@@ -156,9 +156,6 @@ function dispy_community_info() {
$a->page['aside_bottom'] = replace_macros($tpl, $aside);
}
-// use our 'default.php' instead of the system-wide one
-$a->page['template'] = "theme/dispy-dark/default";
-
// aside on profile page
if ($a->argv[0] === "profile") {
dispy_community_info();