bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

eliminate Cropper conflicts with jQuery

Browse source
This commit is contained in:
Zach Prezkuta 2013-06-01 10:42:51 -06:00
commit 127b7a589e
72 changed files with 1659 additions and 1817 deletions
Download patch file Download diff file Expand all files Collapse all files

16
view/theme/decaf-mobile/js/theme.js
View file

@ -23,11 +23,11 @@ document.addEventListener('DOMContentLoaded', function(){
window.imageUploadButton,
{ action: 'wall_upload/'+window.nickname,
name: 'userfile',
onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) {
var currentText = $j(window.jotId).val();
$j(window.jotId).val(currentText + response);
$j('#profile-rotator').hide();
var currentText = $(window.jotId).val();
$(window.jotId).val(currentText + response);
$('#profile-rotator').hide();
}
}
);
@ -37,11 +37,11 @@ document.addEventListener('DOMContentLoaded', function(){
'wall-file-upload',
{ action: 'wall_attach/'+window.nickname,
name: 'userfile',
onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onComplete: function(file,response) {
var currentText = $j(window.jotId).val();
$j(window.jotId).val(currentText + response);
$j('#profile-rotator').hide();
var currentText = $(window.jotId).val();
$(window.jotId).val(currentText + response);
$('#profile-rotator').hide();
}
}
);

2
view/theme/decaf-mobile/js/theme.min.js vendored
View file

@ -1 +1 @@
document.addEventListener("DOMContentLoaded",function(){if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){var currentText=$j(window.jotId).val();$j(window.jotId).val(currentText+response);$j("#profile-rotator").hide()}});if(document.getElementById("wall-file-upload")!=null){var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){var currentText=$j(window.jotId).val();$j(window.jotId).val(currentText+response);$j("#profile-rotator").hide()}})}}});function confirmDelete(f){response=confirm(window.delItem);if(response&&typeof f=="function"){f()}return response}function changeHref(elemId,url){elem=document.getElementById(elemId);elem.href=url}function remove(elemId){elem=document.getElementById(elemId);elem.parentNode.removeChild(elem)}function openClose(el){}
document.addEventListener("DOMContentLoaded",function(){if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$("#profile-rotator").show()},onComplete:function(file,response){var currentText=$(window.jotId).val();$(window.jotId).val(currentText+response);$("#profile-rotator").hide()}});if(document.getElementById("wall-file-upload")!=null){var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$("#profile-rotator").show()},onComplete:function(file,response){var currentText=$(window.jotId).val();$(window.jotId).val(currentText+response);$("#profile-rotator").hide()}})}}});function confirmDelete(f){response=confirm(window.delItem);if(response&&typeof f=="function"){f()}return response}function changeHref(elemId,url){elem=document.getElementById(elemId);elem.href=url}function remove(elemId){elem=document.getElementById(elemId);elem.parentNode.removeChild(elem)}function openClose(el){}

7
view/theme/decaf-mobile/templates/admin_users.tpl
View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script>
function confirm_delete(uname){
return confirm( "{{$confirm_delete}}".format(uname));
@ -11,7 +6,7 @@
return confirm("{{$confirm_delete_multi}}");
}
{{*/*function selectall(cls){
$j("."+cls).attr('checked','checked');
$("."+cls).attr('checked','checked');
return false;
}*/*}}
</script>

5
view/theme/decaf-mobile/templates/cropbody.tpl
View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<h1>{{$title}}</h1>
<p id="cropimage-desc">
{{$desc}}

5
view/theme/decaf-mobile/templates/cropend.tpl
View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
{{*<!-- <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
<script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
<script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>

5
view/theme/decaf-mobile/templates/crophead.tpl
View file

@ -1,6 +1 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />

2
view/theme/decaf-mobile/templates/end.tpl
View file

@ -11,7 +11,6 @@
tinyMCE.init({ mode : "none"});
</script>-->*}}
{{*<!--<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
<script type="text/javascript">var $j = jQuery.noConflict();</script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->*}}
@ -25,6 +24,5 @@
<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/theme.js"></script>
<!--<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.package.js" ></script>
<script type="text/javascript">var $j = jQuery.noConflict();</script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->

5
view/theme/decaf-mobile/templates/field_input.tpl
View file

@ -1,8 +1,3 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div class='field input' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label><br />

9
view/theme/decaf-mobile/templates/jot_geotag.tpl
View file

@ -1,16 +1,11 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude.toFixed(4);
var lon = position.coords.longitude.toFixed(4);
$j('#jot-coord').val(lat + ', ' + lon);
$j('#profile-nolocation-wrapper').show();
$('#jot-coord').val(lat + ', ' + lon);
$('#profile-nolocation-wrapper').show();
});
}

7
view/theme/decaf-mobile/templates/settings_display_end.tpl
View file

@ -1,7 +1,2 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
<script>$(function(){ previewTheme($("#id_{{$theme.0}}")[0]); });</script>

2
view/theme/decaf-mobile/theme.php
View file

@ -28,6 +28,6 @@ function decaf_mobile_content_loaded(&$a) {
$a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/decaf-mobile/login-style.css';
}
if( $a->module === 'login' )
$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>';
$a->page['end'] .= '<script type="text/javascript"> $(document).ready(function() { $("#id_" + window.loginName).focus();} );</script>';
}