Skip to content

[4] deprecated iframe attributes #32913

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

Merged
richard67 merged 5 commits into from
Mar 29, 2021
Merged

[4] deprecated iframe attributes #32913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cbbba8c
deprecated iframe attributes
PhilETaylor Mar 28, 2021
ec83949
Missed one line
PhilETaylor Mar 28, 2021
c7ecf69
remove more parts of deprecated features
PhilETaylor Mar 28, 2021
71924e6
Remove language strings
PhilETaylor Mar 28, 2021
e59dbdc
Update administrator/language/en-GB/com_wrapper.ini
PhilETaylor Mar 28, 2021
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
3 changes: 0 additions & 3 deletions administrator/language/en-GB/com_wrapper.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
COM_WRAPPER="Wrapper"
COM_WRAPPER_FIELD_ADD_DESC="By default, http:// will be added unless it detects http:// or https:// in the URL you provide. This allows you to switch off this functionality."
COM_WRAPPER_FIELD_ADD_LABEL="Auto Add"
COM_WRAPPER_FIELD_FRAME_LABEL="Frame Border"
COM_WRAPPER_FIELD_HEIGHT_LABEL="Height"
COM_WRAPPER_FIELD_HEIGHTAUTO_LABEL="Auto Height"
COM_WRAPPER_FIELD_LABEL_SCROLLBARSPARAMS="Scroll Bar Parameters"
COM_WRAPPER_FIELD_LAZYLOADING_LABEL="Lazy Loading"
COM_WRAPPER_FIELD_SCROLLBARS_LABEL="Scroll Bars"
COM_WRAPPER_FIELD_URL_LABEL="URL"
COM_WRAPPER_FIELD_VALUE_AUTO="Auto"
COM_WRAPPER_XML_DESCRIPTION="Displays an iframe to wrap an external page or site into Joomla!"
2 changes: 0 additions & 2 deletions components/com_wrapper/tmpl/wrapper/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
src="<?php echo $this->escape($this->wrapper->url); ?>"
width="<?php echo $this->escape($this->params->get('width')); ?>"
height="<?php echo $this->escape($this->params->get('height')); ?>"
scrolling="<?php echo $this->escape($this->params->get('scrolling')); ?>"
frameborder="<?php echo $this->escape($this->params->get('frameborder', 1)); ?>"
loading="<?php echo $this->params->get('lazyloading', 'lazy'); ?>"
<?php if ($this->escape($this->params->get('page_heading'))) : ?>
title="<?php echo $this->escape($this->params->get('page_heading')); ?>"
Expand Down
22 changes: 0 additions & 22 deletions components/com_wrapper/tmpl/wrapper/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,6 @@

<!-- Scroll. -->
<fieldset name="basic" label="COM_WRAPPER_FIELD_LABEL_SCROLLBARSPARAMS">
<field
name="scrolling"
type="list"
label="COM_WRAPPER_FIELD_SCROLLBARS_LABEL"
default="auto"
validate="options"
>
<option value="no">JNO</option>
<option value="yes">JYES</option>
<option value="auto">COM_WRAPPER_FIELD_VALUE_AUTO</option>
</field>

<field
name="width"
type="text"
Expand Down Expand Up @@ -80,16 +68,6 @@
<option value="1">JYES</option>
</field>

<field
name="frameborder"
type="radio"
label="COM_WRAPPER_FIELD_FRAME_LABEL"
layout="joomla.form.field.radio.switcher"
default="1"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="lazyloading"
type="radio"
Expand Down
3 changes: 0 additions & 3 deletions language/en-GB/mod_wrapper.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@
MOD_WRAPPER="Wrapper"
MOD_WRAPPER_FIELD_ADD_LABEL="Auto Add http://"
MOD_WRAPPER_FIELD_AUTOHEIGHT_LABEL="Auto Height"
MOD_WRAPPER_FIELD_FRAME_LABEL="Frame Border"
MOD_WRAPPER_FIELD_HEIGHT_LABEL="Height"
MOD_WRAPPER_FIELD_LAZYLOADING_LABEL="Lazy Loading"
MOD_WRAPPER_FIELD_SCROLL_LABEL="Scroll Bars"
MOD_WRAPPER_FIELD_TARGET_LABEL="Target Name"
MOD_WRAPPER_FIELD_URL_LABEL="URL"
MOD_WRAPPER_FIELD_VALUE_AUTO="Auto"
MOD_WRAPPER_FIELD_WIDTH_LABEL="Width"
MOD_WRAPPER_NO_IFRAMES="No iframes"
MOD_WRAPPER_XML_DESCRIPTION="This module shows an iframe window to specified location."
2 changes: 0 additions & 2 deletions modules/mod_wrapper/mod_wrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
$target = htmlspecialchars($params->get('target'), ENT_COMPAT, 'UTF-8');
$width = htmlspecialchars($params->get('width'), ENT_COMPAT, 'UTF-8');
$height = htmlspecialchars($params->get('height'), ENT_COMPAT, 'UTF-8');
$scroll = htmlspecialchars($params->get('scrolling'), ENT_COMPAT, 'UTF-8');
$frameborder = htmlspecialchars($params->get('frameborder'), ENT_COMPAT, 'UTF-8');
$ititle = $module->title;
$id = $module->id;
$lazyloading = $params->get('lazyloading', 'lazy');
Expand Down
24 changes: 0 additions & 24 deletions modules/mod_wrapper/mod_wrapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,6 @@
<option value="1">JYES</option>
</field>

<field
name="scrolling"
type="list"
label="MOD_WRAPPER_FIELD_SCROLL_LABEL"
default="auto"
validate="options"
>
<option value="auto">MOD_WRAPPER_FIELD_VALUE_AUTO</option>
<option value="no">JNO</option>
<option value="yes">JYES</option>
</field>

<field
name="width"
type="text"
Expand Down Expand Up @@ -83,18 +71,6 @@
<option value="1">JYES</option>
</field>

<field
name="frameborder"
type="radio"
layout="joomla.form.field.radio.switcher"
label="MOD_WRAPPER_FIELD_FRAME_LABEL"
default="1"
filter="integer"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>

<field
name="target"
type="text"
Expand Down
2 changes: 0 additions & 2 deletions modules/mod_wrapper/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
src="<?php echo $url; ?>"
width="<?php echo $width; ?>"
height="<?php echo $height; ?>"
scrolling="<?php echo $scroll; ?>"
frameborder="<?php echo $frameborder; ?>"
loading="<?php echo $lazyloading; ?>"
title="<?php echo $ititle; ?>"
class="mod-wrapper wrapper">
Expand Down