Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for JIT image manipulation recipes #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for JIT image manipulation recipes #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions assets/image_preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
var selectors = '.field-upload .field-image_upload .field-uniqueupload .field-multilingual_upload_field .field-multilingual_image_upload'.split(' ');

var defaultValues = {
recipe: false,
width: 40,
height: 0,
resize: 1,
Expand All @@ -33,7 +34,6 @@
var SVG = '.svg';

var createUrl = function (imgSrc, params) {

var newSrc = 'image/{resize}/{width}/{height}{position}';

newSrc = newSrc.replace('{resize}', params.resize);
Expand All @@ -45,9 +45,17 @@
newSrc = imgSrc;
} else {
if (!!~imgSrc.indexOf(WORKSPACE)) {
newSrc = imgSrc.replace(WORKSPACE, newSrc);
if (params && params.recipe) {
newSrc = imgSrc.replace(WORKSPACE, 'image/' + params.recipe);
} else {
newSrc = imgSrc.replace(WORKSPACE, newSrc);
}
} else {
newSrc = '/' + newSrc + imgSrc;
if (params && params.recipe) {
newSrc = '/image/' + params.recipe + imgSrc;
} else {
newSrc = '/' + newSrc + imgSrc;
}
}
}

Expand All @@ -68,12 +76,14 @@
if (!!node.length) {

var
recipe = node.attr('data-recipe'),
width = parseInt(node.attr('data-width'), 10),
height = parseInt(node.attr('data-height'), 10),
resize = parseInt(node.attr('data-resize'), 10),
position = parseInt(node.attr('data-position'), 10),
absolute = node.attr('data-absolute') == 'yes';

params.recipe = recipe || false;
params.width = width || (!!height ? 0 : params.width);
params.height = height || (!!width ? 0 : params.height);
params.resize = resize || params.resize;
Expand Down
19 changes: 19 additions & 0 deletions fields/field.image_preview_settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,14 @@ public function setFromPOST(Array $settings = array()) {
$new_settings['field-classes'] = ( $settings['field-handles'] );

//var_dump(isset($settings['table-width']));die;
$new_settings['table-recipe'] = ( isset($settings['table-recipe']) ? $settings['table-recipe'] : NULL);
$new_settings['table-width'] = ( isset($settings['table-width']) ? $settings['table-width'] : NULL);
$new_settings['table-height'] = ( isset($settings['table-height']) ? $settings['table-height'] : NULL);
$new_settings['table-resize'] = ( isset($settings['table-resize']) ? $settings['table-resize'] : NULL);
$new_settings['table-position'] = ( isset($settings['table-position']) ? $settings['table-position'] : NULL);
$new_settings['table-absolute'] = ( isset($settings['table-absolute']) && $settings['table-absolute'] == 'on' ? 'yes' : 'no');

$new_settings['entry-recipe'] = ( isset($settings['entry-recipe']) ? $settings['entry-recipe'] : NULL);
$new_settings['entry-width'] = ( isset($settings['entry-width']) ? $settings['entry-width'] : NULL);
$new_settings['entry-height'] = ( isset($settings['entry-height']) ? $settings['entry-height'] : NULL);
$new_settings['entry-resize'] = ( isset($settings['entry-resize']) ? $settings['entry-resize'] : NULL);
Expand All @@ -171,11 +173,15 @@ public function checkFields(Array &$errors, $checkForDuplicates) {
}

foreach ($this->prefixes as $key => $prefix) {
$recipe = $this->get($prefix.'recipe');
$width = $this->get($prefix.'width');
$height = $this->get($prefix.'height');
$resize = $this->get($prefix.'resize');
$position = $this->get($prefix.'position');

if (!empty($recipe) && (!is_string($recipe))) {
$errors[$prefix.'recipe'] = __('Recipe must be a string');
}
if (!empty($width) && (!is_numeric($width) || intval($width) < 0)) {
$errors[$prefix.'width'] = __('Width must be a positive integer');
}
Expand Down Expand Up @@ -210,12 +216,14 @@ public function commit() {
// declare an array contains the field's settings
$settings = array();

$t_recipe = $this->get('table-recipe');
$t_width = $this->get('table-width');
$t_height = $this->get('table-height');
$t_resize = $this->get('table-resize');
$t_position = $this->get('table-position');
$t_absolute = $this->get('table-absolute');

$e_recipe = $this->get('entry-recipe');
$e_width = $this->get('entry-width');
$e_height = $this->get('entry-height');
$e_resize = $this->get('entry-resize');
Expand All @@ -229,13 +237,15 @@ public function commit() {
$settings['field-handles'] = $this->get('field-handles');

// the 'table' settings
$settings['table-recipe'] = empty($t_recipe) ? NULL : $t_recipe;
$settings['table-width'] = empty($t_width) ? NULL : $t_width;
$settings['table-height'] = empty($t_height) ? NULL : $t_height;
$settings['table-resize'] = empty($t_resize) ? NULL : $t_resize;
$settings['table-position'] = empty($t_position) ? NULL : $t_position;
$settings['table-absolute'] = empty($t_absolute) ? 'no' : $t_absolute;

// the 'entry' settings
$settings['entry-recipe'] = empty($e_recipe) ? NULL : $e_recipe;
$settings['entry-width'] = empty($e_width) ? NULL : $e_width;
$settings['entry-height'] = empty($e_height) ? NULL : $e_height;
$settings['entry-resize'] = empty($e_resize) ? NULL : $e_resize;
Expand Down Expand Up @@ -320,6 +330,7 @@ public function displayPublishPanel(&$wrapper, $data=NULL, $flagWithError=NULL,
$params = new XMLElement('div');

$params->setAttribute('data-field-classes', $this->convertHandlesIntoIds($this->get('field-handles')));
$params->setAttribute('data-recipe', $this->get('entry-recipe'));
$params->setAttribute('data-width', $this->get('entry-width'));
$params->setAttribute('data-height', $this->get('entry-height'));
$params->setAttribute('data-resize', $this->get('entry-resize'));
Expand Down Expand Up @@ -349,6 +360,10 @@ public function displaySettingsPanel(&$wrapper, $errors=NULL){
$set_wrap = new XMLElement('div', NULL, array('class' => 'compact image_preview'));
$set_wrap->appendChild( new XMLElement('label', __($key . ' Preview settings')) );

/* new line, recipe */
$recipe_wrap = new XMLElement('div', NULL, array('class' => 'two columns'));
$recipe_wrap->appendChild($this->createInput('Recipe handle', $prefix.'recipe', $errors));

/* new line, width/height */
$wh_wrap = new XMLElement('div', NULL, array('class' => 'two columns'));
$wh_wrap->appendChild($this->createInput('Width <i>JIT image manipulation width parameter</i>', $prefix.'width', $errors));
Expand All @@ -367,6 +382,7 @@ public function displaySettingsPanel(&$wrapper, $errors=NULL){

/* append to wrapper */
$wrapper->appendChild($set_wrap);
$wrapper->appendChild($recipe_wrap);
$wrapper->appendChild($wh_wrap);
$wrapper->appendChild($rp_wrap);
$wrapper->appendChild($a_wrap);
Expand Down Expand Up @@ -438,6 +454,7 @@ public function prepareTableValue($data, XMLElement $link=NULL){
}

$link->setAttribute('data-field-classes', $this->convertHandlesIntoIds($this->get('field-handles')));
$link->setAttribute('data-recipe', $this->get('table-recipe'));
$link->setAttribute('data-width', $this->get('table-width'));
$link->setAttribute('data-height', $this->get('table-height'));
$link->setAttribute('data-resize', $this->get('table-resize'));
Expand Down Expand Up @@ -510,11 +527,13 @@ public static function createFieldTable() {
`id` int(11) unsigned NOT NULL auto_increment,
`field_id` int(11) unsigned NOT NULL,
`field-handles` varchar(255) NOT NULL,
`table-recipe` varchar(255) NULL,
`table-width` int(11) unsigned NULL,
`table-height` int(11) unsigned NULL,
`table-resize` int(11) unsigned NULL,
`table-position` int(11) unsigned NULL,
`table-absolute` enum('yes','no') NOT NULL DEFAULT 'no',
`entry-recipe` varchar(255) NULL,
`entry-width` int(11) unsigned NULL,
`entry-height` int(11) unsigned NULL,
`entry-resize` int(11) unsigned NULL,
Expand Down