mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-22 14:23:05 +02:00
Code Issues Releases Wiki Activity

Update for AdminThemeUikit main.js per processwire/processwire-issues#480

Browse Source
This commit is contained in:
Ryan Cramer
2018-03-14 08:13:46 -04:00
parent c1ca1fde3b
commit 11398f00bf
3 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
wire/modules/AdminTheme/AdminThemeUikit/scripts/main.js
View File

@@ -628,6 +628,35 @@ var ProcessWireAdminTheme = {
if($in) ukGridClass('InputfieldColumnWidthLast uk-width-expand', $in); if($in) ukGridClass('InputfieldColumnWidthLast uk-width-expand', $in);
} }
function applyHiddenInputfield() {
// hidden column, reserve space even though its hidden
if(debug) consoleLog('A: hidden', $inputfield);
lastW += w;
width += w;
if($lastInputfield && width >= 100) {
// finishing out row, update last visible column to include the width of the hidden column
lastW += widthHidden;
if(debug) consoleLog('Updating last visible Inputfield to width=' + lastW, $lastInputfield);
ukGridClass(lastW, $lastInputfield);
width = 0;
lastW = 0;
widthHidden = 0;
$lastInputfield = null;
} else {
widthHidden += w;
}
}
function applyFullWidthInputfield() {
// full width column consumes its own row, so we can reset everything here and exit
if(debug) consoleLog("Skipping because full-width", $inputfield);
if(width < 100 && $lastInputfield) expandLastInputfield($lastInputfield);
$lastInputfield = null;
widthHidden = 0;
lastW = 0;
width = 0;
}
$inputfields.each(function() { $inputfields.each(function() {
$inputfield = $(this); $inputfield = $(this);
@@ -646,28 +675,14 @@ var ProcessWireAdminTheme = {
w = hasWidth ? parseInt($inputfield.attr('data-colwidth')) : 0; w = hasWidth ? parseInt($inputfield.attr('data-colwidth')) : 0;
if(!w || w >= 100) { if(!w || w >= 100) {
// full width column consumes its own row, so we can reset everything here and exit // full-width
if(width < 100 && $lastInputfield) expandLastInputfield($lastInputfield); applyFullWidthInputfield();
$lastInputfield = null;
widthHidden = 0;
lastW = 0;
width = 0;
if(debug) consoleLog("Skipping because full-width", $inputfield);
return; return;
} }
if($inputfield.hasClass('InputfieldStateHidden')) { if($inputfield.hasClass('InputfieldStateHidden')) {
// hidden column, reserve space even though its hidden // hidden
if(debug) consoleLog('A: hidden', $inputfield); applyHiddenInputfield();
lastW += w;
width += w;
if($lastInputfield && width >= 100) {
// update previous visible column to include the width of the hidden column
if(debug) consoleLog('Updating this to width=' + lastW, $lastInputfield);
ukGridClass(lastW, $lastInputfield);
} else {
widthHidden += w;
}
return; return;
} }
@@ -704,16 +719,20 @@ var ProcessWireAdminTheme = {
$inputfield.removeClass('InputfieldColumnWidthFirst'); $inputfield.removeClass('InputfieldColumnWidthFirst');
} }
if(widthHidden) { if(isLastColumn) {
// last column in this row, reset for new row
$lastInputfield = null;
width = 0;
lastW = 0;
// if there was any width from previous hidden fields in same row, add it to this field // if there was any width from previous hidden fields in same row, add it to this field
w += widthHidden; if(widthHidden) w += widthHidden;
width -= widthHidden;
widthHidden = 0; widthHidden = 0;
} else {
$lastInputfield = $inputfield;
width += w;
lastW = w;
} }
width += w;
lastW = w;
$lastInputfield = isLastColumn ? null : $inputfield;
ukGridClass(w, $inputfield); ukGridClass(w, $inputfield);
}); });

2
wire/modules/AdminTheme/AdminThemeUikit/scripts/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wire/modules/LanguageSupport/ProcessLanguageTranslator.module
View File

@@ -290,7 +290,7 @@ class ProcessLanguageTranslator extends Process {
$newTextdomains = array(); $newTextdomains = array();
foreach(array('site' => 'file_site', 'wire' => 'file_wire') as $key => $name) { foreach(array('site' => 'file_site', 'wire' => 'file_wire') as $key => $name) {
$postFiles = $this->input->post->$name; $postFiles = $this->input->post->$name;
if(!count($postFiles)) continue; if(!wireCount($postFiles)) continue;
foreach($postFiles as $file) { foreach($postFiles as $file) {
if(!isset($files[$key][$file])) continue; if(!isset($files[$key][$file])) continue;
$textdomain = $this->translator->filenameToTextdomain($file); $textdomain = $this->translator->filenameToTextdomain($file);