harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

take out divgrow until I can fix it

Browse Source
This commit is contained in:
friendica 2012-07-25 04:15:05 -07:00
parent 2534075afe
commit 0bf8954fbd
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/main.js
View File

@ -227,7 +227,11 @@ function updateConvItems(mode,data) {
}); });
$('#' + prev).after($(this)); $('#' + prev).after($(this));
$("abbr.wall-item-ago-time").timeago(); $("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 { else {
$('img',this).each(function() { $('img',this).each(function() {
@ -235,6 +239,8 @@ function updateConvItems(mode,data) {
}); });
$('#' + ident).replaceWith($(this)); $('#' + ident).replaceWith($(this));
$("abbr.wall-item-ago-time").timeago(); $("abbr.wall-item-ago-time").timeago();
// $("div.wall-item-body").divgrow({ initialHeight: 400 });
} }
prev = ident; prev = ident;
}); });
@ -250,6 +256,8 @@ function updateConvItems(mode,data) {
}); });
$('#threads-end').before($(this)); $('#threads-end').before($(this));
$("abbr.wall-item-ago-time").timeago(); $("abbr.wall-item-ago-time").timeago();
// $("div.wall-item-body").divgrow({ initialHeight: 400 });
} }
else { else {
$('img',this).each(function() { $('img',this).each(function() {
@ -257,6 +265,7 @@ function updateConvItems(mode,data) {
}); });
$('#' + ident).replaceWith($(this)); $('#' + ident).replaceWith($(this));
$("abbr.wall-item-ago-time").timeago(); $("abbr.wall-item-ago-time").timeago();
// $("div.wall-item-body").divgrow({ initialHeight: 400 });
} }
}); });
} }
@ -276,6 +285,7 @@ function updateConvItems(mode,data) {
$('#' + prev).after($(this)); $('#' + prev).after($(this));
$("abbr.wall-item-ago-time").timeago(); $("abbr.wall-item-ago-time").timeago();
// $("div.wall-item-body").divgrow({ initialHeight: 400 });
} }
prev = ident; 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); var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
$.get(update_url,function(data) { $.get(update_url,function(data) {
var update_mode = ((page_load) ? 'replace' : 'update');
in_progress = false; in_progress = false;
updateConvItems('update',data); updateConvItems(update_mode,data);
}); });
@ -710,4 +721,8 @@ jQuery.timeago.settings.strings = {
$("abbr.wall-item-ago-time").timeago(); $("abbr.wall-item-ago-time").timeago();
}); $("div.wall-item-body").divgrow({ initialHeight: 400 });
});

1
view/head.tpl
View File

@ -27,6 +27,7 @@
<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script> <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/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.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/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/jgrowl/jquery.jgrowl_minimized.js"></script>
<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script> <script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>