@@ -123,6 +135,15 @@
}
if($_REQUEST['ajax'] == 'thickbox_url') { ?>
+
@@ -181,80 +202,72 @@
}
if($_REQUEST['ajax'] == 'photo_js') { ?>
-
- tb_init('a.thickbox, area.thickbox, input.thickbox'); //pass where to apply thickbox
+
+
+ // gather images and load some default JS
+
+ var last = null
+ var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
+ var my_src = eval(
+ jQuery.ajax({
+ type: "GET",
+ url: "",
+ cache : false,
+ async : false,
+ data: "ajax=photo_images&u=",
+ dataType : "script"
+ }).responseText
+ );
+
+ for (i = 0; i < my_src.length; i++) {
+ img = new Image();
+ img.src = my_src[i];
+ img_attr = 'id="img' + i + '"';
+ skip = false;
+ if (img.width && img.height) {
+ if (img.width * img.height < 2500)
+ skip = true;
+ aspect = img.width / img.height;
+ scale = (aspect > 1) ? (75 / img.width) : (75 / img.height);
- function image_selector() {
- desc = jQuery('#this_photo_description').val();
- src = jQuery('#this_photo').val();
- pick(src, desc);
- tb_remove();
- return false;
- }
+ w = img.width;
+ h = img.height;
- jQuery(document).ready(function() {
- jQuery('#this_photo').focus();
-
- jQuery('.cancel').click(function() {
- tb_remove();
- });
-
- jQuery('.select').click(function() {
- image_selector();
- });
-
- jQuery('#photo_add_url').attr('href', '?ajax=thickbox_url&height=200&width=500');
-
- });
-
-
- function pick(img, desc) {
- if (img) {
- length = jQuery('.photolist input').length;
- if(length == 0) length = 1;
- jQuery('.photolist').append('');
- jQuery('.photolist').append('');
- append_editor('
'); }
- tinyMCE.activeEditor.resizeToContent();
- return false;
+ if (scale < 1) {
+ w = parseInt(img.width * scale);
+ h = parseInt(img.height * scale);
}
-
- var last = null
- var my_src, img, img_tag, aspect, w, h, skip, i, strtoappend = "";
- var my_src = eval(
- jQuery.ajax({
- type: "GET",
- url: "",
- cache : false,
- async : false,
- data: "ajax=photo_images&u=",
- dataType : "script"
- }).responseText);
-
- for (i = 0; i < my_src.length; i++) {
- img = new Image(); img.src = my_src[i]; img_attr = 'id="img' + i; skip = false;
-
- if (img.width && img.height) {
- if (img.width * img.height < 2500)
- skip = true;
- aspect = img.width / img.height;
- scale = (aspect > 1) ? (75 / img.width) : (75 / img.height);
-
- if (scale < 1) {
- w = parseInt(img.width * scale);
- h = parseInt(img.height * scale);
- } else {
- w = img.width;
- h = img.height;
- }
- img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
- }
-
- if (!skip) strtoappend += '
';
-
- }
- jQuery('#img_container').html(strtoappend);
-
+ img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
+ }
+ if (!skip) strtoappend += '';
+ }
+
+ function pick(img, desc) {
+ if (img) {
+ length = jQuery('.photolist input').length;
+ if(length == 0) length = 1;
+ jQuery('.photolist').append('');
+ jQuery('.photolist').append('');
+ append_editor('');
+ }
+ tinyMCE.activeEditor.resizeToContent();
+ return false;
+ }
+
+ function image_selector() {
+ tb_remove();
+ desc = jQuery('#this_photo_description').val();
+ src = jQuery('#this_photo').val();
+ pick(src, desc);
+ return false;
+ }
+
+ jQuery(document).ready(function() {
+ jQuery('#img_container').html(strtoappend);
+ jQuery('#photo_add_url').attr('href', '?ajax=thickbox_url&height=200&width=500');
+ tb_init('a.thickbox, area.thickbox, input.thickbox');
+ });
+
@@ -292,7 +305,6 @@
if ( isset($strings) ) echo $strings; ?>
(function() {
var base = tinymce.baseURL, sl = tinymce.ScriptLoader, ln = "";
-
sl.markDone(base + '/langs/' + ln + '.js');
sl.markDone(base + '/themes/advanced/langs/' + ln + '.js');
sl.markDone(base + '/themes/advanced/langs/' + ln + '_dlg.js');
@@ -354,14 +366,17 @@
jQuery('#' + type + '_button').addClass('ui-tabs-selected');
jQuery("#post_type").val(type);
}
+
function set_editor(text) {
if(tinyMCE.activeEditor) tinyMCE.activeEditor.setContent('');
if(tinyMCE.activeEditor) tinyMCE.execCommand('mceInsertContent' ,false, text);
}
+
function append_editor(text) {
if(tinyMCE.activeEditor) tinyMCE.execCommand('mceInsertContent' ,false, text);
}
+
function set_title(title) { jQuery("#content_type").text(title); }
function show(tab_name) {
@@ -371,24 +386,21 @@
case 'text' :
set_menu('text');
set_title('');
-
return false;
- break;
+ break;
case 'quote' :
set_menu('quote');
set_title('');
set_editor("
"); return false; - break; + break; case 'video' : - set_menu('video'); set_title(''); jQuery('#extra_fields').show(); jQuery('body').addClass('video_split'); jQuery('#extra_fields').load('', { ajax: 'video', s: ''}, function() { - "); }); - return false; - break; - + break; case 'photo' : set_menu('photo'); set_title('Post'); @@ -430,12 +440,9 @@ jQuery('#waiting').remove(); } }); - return false; - break; - + break; } - } jQuery(document).ready(function() { @@ -445,6 +452,7 @@ show(tab_name); }); + // Set default tabs show('video'); @@ -453,64 +461,60 @@ show('photo'); }); + - + -