');
$form[] = array('#value' => $properties_image);
$form[] = array('#value' => ''. $node->title .'');
-
+ // hidden fields for editor and element
+ $form['editor'] = array(
+ '#type' => 'hidden',
+ '#value' => $editor,
+ );
+ $form['element'] = array(
+ '#type' => 'hidden',
+ '#value' => $element,
+ );
+
// Image node properties fieldset.
$form['properties'] = array('#type' => 'fieldset', '#title' => t('Image properties'));
$form['properties'][] = array('#value' => ''. t('Size') .': '. strtr('@widthx@height px', array('@width' => $image_info['width'], '@height' => $image_info['height'])) .' ');
$form['width'] = array(
@@ -1006,7 +913,7 @@ function img_assist_properties_form($for
'#default_value' => $default_width,
'#size' => 4,
'#maxlength' => 4,
- '#attributes' => array('onblur' => 'parent.onChangeWidth()'),
+ '#attributes' => array('onblur' => 'onChangeWidth()'),
);
$form[] = array('#value' => ' x ');
$form['height'] = array(
@@ -1014,7 +921,7 @@ function img_assist_properties_form($for
'#default_value' => $default_height,
'#size' => 4,
'#maxlength' => 4,
- '#attributes' => array('onblur' => 'parent.onChangeHeight()'),
+ '#attributes' => array('onblur' => 'onChangeHeight()'),
);
$form[] = array('#value' => ' ');
$form[] = array('#value' => ' | ');
@@ -1038,7 +945,7 @@ function img_assist_properties_form($for
'#title' => t('Link'),
'#default_value' => variable_get('img_assist_default_link_behavior', 'none'),
'#options' => array('none' => t('Not a link'), 'node' => t('Link to image page'), 'popup' => t('Open in popup window'), 'url' => t('Go to URL')),
- '#attributes' => array('onchange' => 'parent.onChangeLink()'),
+ '#attributes' => array('onchange' => 'onChangeLink()'),
);
$form['url'] = array(
'#type' => 'textfield',
@@ -1110,13 +1017,13 @@ function img_assist_properties_form($for
$form['insert'] = array(
'#type' => 'submit',
'#value' => ($update) ? t('Update') : t('Insert'),
- '#attributes' => array('onclick' => 'parent.insertImage()', 'style' => 'float: left;'),
+ '#attributes' => array('style' => 'float: left;'),
);
$form['cancel'] = array(
'#type' => 'button',
'#value' => t('Cancel'),
'#button_type' => 'button',
- '#attributes' => array('onclick' => 'parent.cancelAction()', 'style' => 'float: right;'),
+ '#attributes' => array('onclick' => 'cancelAction()', 'style' => 'float: right;'),
);
$form[] = array('#value' => '');
@@ -1126,53 +1033,20 @@ function img_assist_properties_form($for
return $form;
}
-function img_assist_properties_form_validate($form, &$form_state) {
- $html = img_assist_render_image($form_state['values']);
- img_assist_set_htmlcode($html);
- drupal_goto('img_assist/insert_html');
-}
/**
- * Store image tag or HTML in session.
- *
- * Used for saving HTML code so it can be inserted instead of the filter tags.
- *
- * @param string $htmlcode
- * A filter tag or HTML code. If omitted, session variable is emptied.
- *
- * @return string
- * A previously stored value in the user session.
+ * @todo Write own submit handler and insert the HTML code there.
*/
-function img_assist_set_htmlcode($htmlcode = NULL) {
- if (isset($htmlcode)) {
- $_SESSION['htmlcode'] = urlencode($htmlcode);
+function img_assist_properties_form_submit($form, &$form_state) {
+ $val = $form_state['values'];
+ if ($val['insertmode'] == 'html') {
+ $content = img_assist_render_image($val);
+ } else { // filtertag
+ $content = '[img_assist|nid=' . $val['nid'] . '|title=' . $val['title'] . '|desc=' . $val['desc'] . '|link=' . $val['link'];
+ $content .= '|align=' . $val['align'] . '|width=' . $val['width'] . '|height=' . $val['height'] . ']';
}
- else {
- $html = urldecode($_SESSION['htmlcode']);
- $_SESSION['htmlcode'] = '';
- return $html;
- }
-}
-
-function img_assist_insert_html() {
- $output = drupal_get_form('img_assist_insert_html_form');
- echo theme('img_assist_page', $output, array('id' => 'img_assist_insert_html', 'onload' => 'parent.insertImage();', 'class' => 'img_assist'));
-}
-
-function img_assist_insert_html_form() {
- $htmlcode = img_assist_set_htmlcode();
- $form[] = array(
- '#id' => 'finalhtmlcode',
- '#type' => 'hidden',
- '#value' => $htmlcode,
- );
-
- $form['insertmode'] = array(
- '#type' => 'hidden',
- '#value' => 'html2',
- );
-
- return $form;
+ echo theme('img_assist_page', 'You can close this window now.', array('id' => 'img_assist_thumbs', 'class' => 'img_assist', 'onload' => 'insertToEditor(\'' . $val['element'] . '\', \'' . $content . '\');'));
+ exit();
}
/**
@@ -1778,6 +1652,14 @@ function theme_img_assist_popup($content
function theme_img_assist_page($content, $attributes = NULL) {
$title = drupal_get_title();
+ $path = drupal_get_path('module', 'img_assist');
+ drupal_add_js($path .'/img_assist_popup.js', 'module', 'header', FALSE, FALSE);
+ $editor = 'textarea';
+ if ($editor == 'tinymce') {
+ $tinymce_path = drupal_get_path('module', 'wysiwyg');
+ drupal_add_js($tinymce_path .'/tinymce/jscripts/tiny_mce/tiny_mce_popup.js');
+ }
+ drupal_add_js($path .'/img_assist_'. $editor .'.js', 'module', 'header', FALSE, FALSE);
$output = ''."\n";
$output .= ''."\n";
$output .= "\n";
@@ -1805,6 +1687,10 @@ function theme_img_assist_page($content,
// was loaded.
$output .= drupal_get_html_head();
$output .= drupal_get_js();
+ /*
+ @todo this should go to the JS file
+ @todo note: modules css should not go after the theme! themes may override every modules css!
+
$output .= "\n |