mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-17 12:10:45 +02:00
Code Issues Releases Wiki Activity

Various minor updates, mostly phpdoc related

Browse Source
This commit is contained in:
Ryan Cramer
2019-05-03 11:59:18 -04:00
parent 3a094f6447
commit 2880ff6d57
12 changed files with 70 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wire/core/WireUpload.php
View File

@@ -797,6 +797,17 @@ class WireUpload extends Wire {
public function getOverwrittenFiles() {
return $this->overwrittenFiles;
}
/**
* Is an ajax upload request currently in progress?
*
* @return bool
* @since 3.0.131
*
*/
public static function isAjaxUploading() {
return !empty($_SERVER['HTTP_X_FILENAME']);
}
}

2
wire/modules/AdminTheme/AdminThemeUikit/uikit/dist/css/uikit.pw.css vendored
View File

@@ -11756,7 +11756,7 @@ table.AdminDataTable:not(.uk-table) .pw-table-sort-value {
border-left: none;
}
.pw-table-resizable .tablesorter-resizable-handle {
margin-left: 37px;
/*margin-left: 37px;*/
}
.uk-tab > li.uk-active {
background: #fff;

2
wire/modules/AdminTheme/AdminThemeUikit/uikit/dist/css/uikit.pw.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.css
View File

File diff suppressed because one or more lines are too long

38
wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.js
View File

@@ -153,6 +153,28 @@ function InputfieldRepeater($) {
return false;
};
var eventSettingsClick = function(e) {
var $this = $(this);
var $item = $this.closest('.InputfieldRepeaterItem');
var $settings = $item.children('.InputfieldContent')
.children('.Inputfields')
.children('.InputfieldWrapper')
.children('.Inputfields').children('.InputfieldRepeaterSettings');
if($item.hasClass('InputfieldStateCollapsed')) {
$this.closest('.InputfieldHeader').click(); //find('.InputfieldRepeaterToggle').click();
}
if($settings.is(':visible')) {
$settings.slideUp('fast');
$this.addClass('ui-priority-secondary');
} else {
$settings.slideDown('fast');
$this.removeClass('ui-priority-secondary');
}
return false
}
/**
* Event handler for when the repeater item "on/off" toggle is clicked
*
@@ -655,6 +677,7 @@ function InputfieldRepeater($) {
var $toggle = $("<i class='fa InputfieldRepeaterToggle' data-on='fa-toggle-on' data-off='fa-toggle-off'></i>");
var cfg = ProcessWire.config.InputfieldRepeater;
var allowClone = !$inputfieldRepeater.hasClass('InputfieldRepeaterNoAjaxAdd');
var allowSettings = $inputfieldRepeater.hasClass('InputfieldRepeaterHasSettings');
if(cfg) {
$toggle.attr('title', cfg.labels.toggle);
@@ -662,11 +685,16 @@ function InputfieldRepeater($) {
$clone.attr('title', cfg.labels.clone);
}
if(allowSettings) {
$inputfieldRepeater.find('.InputfieldRepeaterSettings').hide();
}
$headers.each(function() {
var $t = $(this);
if($t.hasClass('InputfieldRepeaterHeaderInit')) return;
var icon = 'fa-arrows';
var $item = $t.parent();
var $settings = $t.find('.InputfieldRepeaterSettingsToggle').length > 0;
if($item.hasClass('InputfieldRepeaterNewItem')) {
// noAjaxAdd mode
icon = 'fa-plus';
@@ -681,10 +709,17 @@ function InputfieldRepeater($) {
var $deleteControl = $delete.clone(true);
var $collapseControl = $t.find('.toggle-icon');
$controls.prepend($collapseControl);
if(allowSettings) {
var $settingsToggle = $("<i class='fa fa-gear InputfieldRepeaterSettingsToggle ui-priority-secondary'></i>")
.attr('title', cfg.labels.settings);
$controls.prepend($settingsToggle);
}
if(allowClone) $controls.prepend($clone.clone(true));
$controls.prepend($toggleControl).prepend($deleteControl);
$controls.prepend($toggleControl);
$controls.prepend($deleteControl);
$t.prepend($controls);
$controls.css('background-color', $t.css('background-color'));
}
adjustItemLabel($item, false);
});
@@ -891,6 +926,7 @@ function InputfieldRepeater($) {
.on('click', '.InputfieldRepeaterTrash', eventDeleteClick)
.on('dblclick', '.InputfieldRepeaterTrash', eventDeleteDblClick)
.on('click', '.InputfieldRepeaterClone', eventCloneClick)
.on('click', '.InputfieldRepeaterSettingsToggle', eventSettingsClick)
.on('dblclick', '.InputfieldRepeaterToggle', eventOpenAllClick)
.on('click', '.InputfieldRepeaterToggle', eventToggleClick)
.on('opened', '.InputfieldRepeaterItem', eventItemOpened)

2
wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.module
View File

@@ -647,6 +647,7 @@ class InputfieldRepeater extends Inputfield implements InputfieldItemList {
'removeAll' => $this->_x('Delete all items?', 'repeater-item-action'),
'toggle' => $this->_x('Click to turn item on/off, or double-click to open/collapse all items', 'repeater-item-action'),
'clone' => $this->_x('Clone this item?', 'repeater-item-action'),
'settings' => $this->_('Show settings?)', 'repeater-item-action'),
'openAll' => $this->_x('Open all items?', 'repeater-item-action'),
'collapseAll' => $this->_x('Collapse all items?', 'repeater-item-action'),
'disabledMinMax' => $this->_('This action is disabled per min and/or max item settings.')

9
wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.scss
View File

@@ -34,6 +34,8 @@
white-space: nowrap;
height: 100%;
.InputfieldRepeaterSettingsToggle,
.InputfieldRepeaterClone,
.InputfieldRepeaterToggle,
.InputfieldRepeaterTrash,
@@ -50,6 +52,9 @@
.InputfieldRepeaterClone {
margin-right: 1em;
}
.InputfieldRepeaterSettingsToggle {
margin-right: 1em;
}
.pw-icon-disabled {
opacity: 0.3;
}
@@ -63,6 +68,10 @@
}
.InputfieldStateCollapsed .InputfieldRepeaterSettingsToggle {
display: none;
}
.InputfieldRepeaterItem:not(.InputfieldRepeaterDeletePending) {
// repeater items not marked for deletion

3
wire/modules/Inputfield/InputfieldHidden.module
View File

@@ -1,9 +1,10 @@
<?php namespace ProcessWire;
/**
* An Inputfield for handling XHTML "hidden" form inputs
* An Inputfield for handling HTML “hidden” form inputs
*
* @property bool $renderValueAsInput Render the hidden input, even when in renderValue mode (default=false)
* @property string $initValue Initial populated value if value attribute not separately populated (default='')
*
*/
class InputfieldHidden extends Inputfield {

6
wire/modules/Markup/MarkupHTMLPurifier/MarkupHTMLPurifier.module
View File

@@ -87,7 +87,7 @@ class MarkupHTMLPurifier extends WireData implements Module {
/**
* Return the current settings
*
* @return HTMLPurifier_Config
* @return \HTMLPurifier_Config
*
*/
public function getConfig() {
@@ -97,7 +97,7 @@ class MarkupHTMLPurifier extends WireData implements Module {
/**
* Get the HTMLPurifier instance
*
* @return HTMLPurifier
* @return \HTMLPurifier
*
*/
public function getPurifier() {
@@ -134,7 +134,7 @@ class MarkupHTMLPurifier extends WireData implements Module {
*
* @param string $key
* @param string $value
* @return this
* @return WireData|MarkupHTMLPurifier
*
*/
public function set($key, $value) {

2
wire/modules/Process/ProcessPageLister/ProcessPageLister.css
View File

@@ -1 +1 @@
#ProcessLister{margin-top:-2px}#ProcessListerResultsTab{padding-top:.5em}#ProcessListerResults>form.InputfieldForm{margin-bottom:0}#ProcessListerResults #ProcessListerTable{clear:both;overflow-x:auto}#ProcessListerResults #ProcessListerTable>div{margin-top:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable{clear:both;position:relative;margin-top:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable td table{width:100%}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead th{font-size:.8571428571em}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead th i{font-size:14px}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead th strong{white-space:nowrap}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead th b,#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead .th b{display:none}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead th:first-child{padding-left:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td{font-size:.9285714286em}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td:first-child,#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td:first-child>a{padding-left:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td ul.MarkupFieldtype{margin:0;padding-left:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td ul.MarkupFieldtype>li{list-style:none;margin:0;padding-left:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td ul.MarkupFieldtype>li+li{border-top:1px solid #eee}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td>*:first-child,#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td .col_preview>*:first-child{margin-top:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td>*:last-child,#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td .col_preview>*:last-child{margin-bottom:0}#ProcessListerResults .PageListerActions{display:none;line-height:1.3em;text-transform:lowercase}#ProcessListerResults .PageListerActions a.PageExtra{margin-bottom:3px}#ProcessListerResults .PageListerActions a.PageExtras i{margin-left:3px;margin-right:2px}#ProcessListerResults .PageListerActions a.PageExtras.open i{margin-left:2px;margin-right:3px}#ProcessListerResults .row_message{display:inline}#ProcessListerResults .PageListStatusUnpublished{text-decoration:line-through;opacity:.5}#ProcessListerResults .PageListStatusHidden{opacity:.5}#ProcessListerResults .MarkupPagerNav{float:right}#ProcessListerResults .nobr{white-space:nowrap}#ProcessListerResults table+.MarkupPagerNav{margin:0}#ProcessListerResults .datetime{white-space:nowrap}#ProcessListerResults td:not(.col_editing) .InputfieldHasFileList .InputfieldHeader{display:none}#ProcessListerResults td:not(.col_editing) .InputfieldHasFileList .InputfieldContent{padding:5px;border:none;margin-top:5px;margin-bottom:5px}@media only screen and (max-width: 767px){#ProcessListerResults table.ProcessListerTable+.MarkupPagerNav{margin-bottom:1em}#ProcessListerResults .MarkupPagerNav{float:none}}.AdminDataTable p{margin:1em 0}#ProcessListerResults+a button{float:left;margin-right:0;margin-top:0}#ProcessListerSpinner{margin-left:.5em;font-size:20px;position:relative}#ProcessListerSpinner i{position:absolute;top:-15px;left:0}.pw-content .lister_headline,#content .lister_headline{float:left;margin-top:1em}@media only screen and (max-width: 767px){.pw-content .lister_headline,#content .lister_headline{float:none;clear:both}}#lister_open_cnt{display:none}#filters_spinner{float:right;margin-top:4px}#ProcessListerRefreshTab{float:right}#ProcessListerSelector{display:inline-block}p.version{clear:both;padding-top:1em}#ProcessListerScript{display:none}#table_bookmarks{margin-top:.5em}.AdminThemeReno a.lister-lightbox{padding:0 !important}.AdminThemeReno a.lister-lightbox img{margin:0 !important}.AdminThemeReno #content .lister_headline{margin-top:.5em}#ProcessListerTable .InputfieldFile .InputfieldContent,#ProcessListerTable .InputfieldFile .InputfieldHeader,#ProcessListerTable .InputfieldImage .InputfieldContent,#ProcessListerTable .InputfieldImage .InputfieldHeader{background:inherit}#ProcessListerTable .InputfieldFile .InputfieldHeader,#ProcessListerTable .InputfieldImage .InputfieldHeader{padding-left:0;padding-right:0;padding-top:0}#ProcessListerTable .InputfieldFile .gridImage__tooltip table th,#ProcessListerTable .InputfieldFile .gridImage__tooltip table td,#ProcessListerTable .InputfieldImage .gridImage__tooltip table th,#ProcessListerTable .InputfieldImage .gridImage__tooltip table td{padding:0}
#ProcessLister{margin-top:-2px}#ProcessListerResultsTab{padding-top:.5em}#ProcessListerResults>form.InputfieldForm{margin-bottom:0}#ProcessListerResults #ProcessListerTable{clear:both;overflow-x:auto}#ProcessListerResults #ProcessListerTable>div{margin-top:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable{clear:both;margin-top:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable td table{width:100%}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead th{font-size:.8571428571em}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead th i{font-size:14px}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead th strong{white-space:nowrap}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead th b,#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead .th b{display:none}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>thead th:first-child{padding-left:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td{font-size:.9285714286em}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td:first-child,#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td:first-child>a{padding-left:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td ul.MarkupFieldtype{margin:0;padding-left:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td ul.MarkupFieldtype>li{list-style:none;margin:0;padding-left:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td ul.MarkupFieldtype>li+li{border-top:1px solid #eee}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td>*:first-child,#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td .col_preview>*:first-child{margin-top:0}#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td>*:last-child,#ProcessListerResults #ProcessListerTable table.ProcessListerTable>tbody>tr>td .col_preview>*:last-child{margin-bottom:0}#ProcessListerResults .PageListerActions{display:none;line-height:1.3em;text-transform:lowercase}#ProcessListerResults .PageListerActions a.PageExtra{margin-bottom:3px}#ProcessListerResults .PageListerActions a.PageExtras i{margin-left:3px;margin-right:2px}#ProcessListerResults .PageListerActions a.PageExtras.open i{margin-left:2px;margin-right:3px}#ProcessListerResults .row_message{display:inline}#ProcessListerResults .PageListStatusUnpublished{text-decoration:line-through;opacity:.5}#ProcessListerResults .PageListStatusHidden{opacity:.5}#ProcessListerResults .MarkupPagerNav{float:right}#ProcessListerResults .nobr{white-space:nowrap}#ProcessListerResults table+.MarkupPagerNav{margin:0}#ProcessListerResults .datetime{white-space:nowrap}#ProcessListerResults td:not(.col_editing) .InputfieldHasFileList .InputfieldHeader{display:none}#ProcessListerResults td:not(.col_editing) .InputfieldHasFileList .InputfieldContent{padding:5px;border:none;margin-top:5px;margin-bottom:5px}@media only screen and (max-width: 767px){#ProcessListerResults table.ProcessListerTable+.MarkupPagerNav{margin-bottom:1em}#ProcessListerResults .MarkupPagerNav{float:none}}.AdminDataTable p{margin:1em 0}#ProcessListerResults+a button{float:left;margin-right:0;margin-top:0}#ProcessListerSpinner{margin-left:.5em;font-size:20px;position:relative}#ProcessListerSpinner i{position:absolute;top:-15px;left:0}.pw-content .lister_headline,#content .lister_headline{float:left;margin-top:1em}@media only screen and (max-width: 767px){.pw-content .lister_headline,#content .lister_headline{float:none;clear:both}}#lister_open_cnt{display:none}#filters_spinner{float:right;margin-top:4px}#ProcessListerRefreshTab{float:right}#ProcessListerSelector{display:inline-block}p.version{clear:both;padding-top:1em}#ProcessListerScript{display:none}#table_bookmarks{margin-top:.5em}.AdminThemeReno a.lister-lightbox{padding:0 !important}.AdminThemeReno a.lister-lightbox img{margin:0 !important}.AdminThemeReno #content .lister_headline{margin-top:.5em}#ProcessListerTable .InputfieldFile .InputfieldContent,#ProcessListerTable .InputfieldFile .InputfieldHeader,#ProcessListerTable .InputfieldImage .InputfieldContent,#ProcessListerTable .InputfieldImage .InputfieldHeader{background:inherit}#ProcessListerTable .InputfieldFile .InputfieldHeader,#ProcessListerTable .InputfieldImage .InputfieldHeader{padding-left:0;padding-right:0;padding-top:0}#ProcessListerTable .InputfieldFile .gridImage__tooltip table th,#ProcessListerTable .InputfieldFile .gridImage__tooltip table td,#ProcessListerTable .InputfieldImage .gridImage__tooltip table th,#ProcessListerTable .InputfieldImage .gridImage__tooltip table td{padding:0}

2
wire/modules/Process/ProcessPageLister/ProcessPageLister.scss
View File

@@ -25,7 +25,7 @@
#ProcessListerTable table.ProcessListerTable {
clear: both;
position: relative;
// position: relative;
margin-top: 0;
td table {