aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-07-25 04:15:05 -0700
committerfriendica <info@friendica.com>2012-07-25 04:15:05 -0700
commit0bf8954fbd80f118fce445903bf344daaa773132 (patch)
tree2c156e4fa39f1f96c69f46094b9ff21bcc780400
parent2534075afe1b56396221a58a66051a3b7ae2f21d (diff)
downloadvolse-hubzilla-0bf8954fbd80f118fce445903bf344daaa773132.tar.gz
volse-hubzilla-0bf8954fbd80f118fce445903bf344daaa773132.tar.bz2
volse-hubzilla-0bf8954fbd80f118fce445903bf344daaa773132.zip
take out divgrow until I can fix it
-rw-r--r--js/main.js21
-rw-r--r--view/head.tpl1
2 files changed, 19 insertions, 3 deletions
diff --git a/js/main.js b/js/main.js
index fc24aafe2..235859f90 100644
--- a/js/main.js
+++ b/js/main.js
@@ -227,7 +227,11 @@ function updateConvItems(mode,data) {
});
$('#' + prev).after($(this));
$("abbr.wall-item-ago-time").timeago();
-
+ // divgrow doesn't prevent itself from attaching a second (or 500th)
+ // "show more" div to a content region - it also has a few other
+ // issues related to how we're trying to use it.
+ // disable for now.
+ // $("div.wall-item-body").divgrow({ initialHeight: 400 });
}
else {
$('img',this).each(function() {
@@ -235,6 +239,8 @@ function updateConvItems(mode,data) {
});
$('#' + ident).replaceWith($(this));
$("abbr.wall-item-ago-time").timeago();
+ // $("div.wall-item-body").divgrow({ initialHeight: 400 });
+
}
prev = ident;
});
@@ -250,6 +256,8 @@ function updateConvItems(mode,data) {
});
$('#threads-end').before($(this));
$("abbr.wall-item-ago-time").timeago();
+ // $("div.wall-item-body").divgrow({ initialHeight: 400 });
+
}
else {
$('img',this).each(function() {
@@ -257,6 +265,7 @@ function updateConvItems(mode,data) {
});
$('#' + ident).replaceWith($(this));
$("abbr.wall-item-ago-time").timeago();
+ // $("div.wall-item-body").divgrow({ initialHeight: 400 });
}
});
}
@@ -276,6 +285,7 @@ function updateConvItems(mode,data) {
$('#' + prev).after($(this));
$("abbr.wall-item-ago-time").timeago();
+ // $("div.wall-item-body").divgrow({ initialHeight: 400 });
}
prev = ident;
});
@@ -323,8 +333,9 @@ function updateConvItems(mode,data) {
var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
$.get(update_url,function(data) {
+ var update_mode = ((page_load) ? 'replace' : 'update');
in_progress = false;
- updateConvItems('update',data);
+ updateConvItems(update_mode,data);
});
@@ -710,4 +721,8 @@ jQuery.timeago.settings.strings = {
$("abbr.wall-item-ago-time").timeago();
-}); \ No newline at end of file
+$("div.wall-item-body").divgrow({ initialHeight: 400 });
+
+
+});
+
diff --git a/view/head.tpl b/view/head.tpl
index 14b831b07..34efa1bd8 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -27,6 +27,7 @@
<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
<script type="text/javascript" src="$baseurl/library/jquery.timeago.js"></script>
+<script type="text/javascript" src="$baseurl/library/jquery.divgrow/jquery.divgrow-1.3.1.js"></script>
<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>