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

reverting to fancybox for "save to file" selection box until we find a better way - prettyPhoto just isn't working for this and I really need this functionality ATM until we can figure out how to make prettyPhoto work properly here.

Browse Source
This commit is contained in:
friendica 2013-04-21 22:12:18 -07:00
parent 868a1877d2
commit 7621bd3bb1
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/zot.php
View File

@ -865,6 +865,8 @@ function zot_import($arr) {
$result = process_profile_delivery($i['notify']['sender'],$arr,$deliveries); $result = process_profile_delivery($i['notify']['sender'],$arr,$deliveries);
} }
} }
if($result) if($result)
$return = array_merge($return,$result); $return = array_merge($return,$result);

2
version.inc
View File

@ -1 +1 @@
2013-04-19.288 2013-04-21.290

6
view/tpl/jot-header.tpl
View File

@ -88,7 +88,7 @@ function initEditor(cb){
editor = true; editor = true;
// setup acl popup // setup acl popup
$("a#jot-perms-icon").prettyPhoyo({ $("a#jot-perms-icon").prettyPhoto({
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic' 'transitionOut' : 'elastic'
}); });
@ -252,7 +252,7 @@ function enableOnUser(){
var bordercolor = $("input").css("border-color"); var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){ $.get('filer/', function(data){
$.prettyPhoto(data); $.fancybox(data);
$("#id_term").keypress(function(){ $("#id_term").keypress(function(){
$(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
@ -270,7 +270,7 @@ function enableOnUser(){
// if(timer) clearTimeout(timer); // if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000); // timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$.prettyPhoto.close(); $.fancybox.close();
} else { } else {
$("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color","#FF0000");
} }

6
view/tpl/smarty3/jot-header.tpl
View File

@ -93,7 +93,7 @@ function initEditor(cb){
editor = true; editor = true;
// setup acl popup // setup acl popup
$("a#jot-perms-icon").prettyPhoyo({ $("a#jot-perms-icon").prettyPhoto({
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic' 'transitionOut' : 'elastic'
}); });
@ -257,7 +257,7 @@ function enableOnUser(){
var bordercolor = $("input").css("border-color"); var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){ $.get('filer/', function(data){
$.prettyPhoto(data); $.fancybox(data);
$("#id_term").keypress(function(){ $("#id_term").keypress(function(){
$(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
@ -275,7 +275,7 @@ function enableOnUser(){
// if(timer) clearTimeout(timer); // if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000); // timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$.prettyPhoto.close(); $.fancybox.close();
} else { } else {
$("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color","#FF0000");
} }