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

[4.0] TinyMCE mobile #27501

Merged
merged 3 commits into from
Jan 23, 2020
Merged

[4.0] TinyMCE mobile #27501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2084ed
[4.0] TinyMCE mobile
brianteeman Jan 12, 2020
1aefa3a
Merge branch '4.0-dev' into saturday5
brianteeman Jan 13, 2020
6cd1265
Merge branch '4.0-dev' into saturday5
brianteeman Jan 23, 2020
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
1 change: 0 additions & 1 deletion administrator/language/en-GB/plg_editors_tinymce.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ PLG_TINY_FIELD_HTMLWIDTH_LABEL="HTML Width"
PLG_TINY_FIELD_LABEL_ADVANCEDPARAMS="Advanced"
PLG_TINY_FIELD_LANGCODE_LABEL="Language Code"
PLG_TINY_FIELD_LANGSELECT_LABEL="Automatic Language Selection"
PLG_TINY_FIELD_MOBILE_LABEL="Mobile Mode"
PLG_TINY_FIELD_NEWLINES_LABEL="New Lines"
PLG_TINY_FIELD_NUMBER_OF_SETS_LABEL="Number of Sets"
PLG_TINY_FIELD_PATH_LABEL="Element Path"
Expand Down
11 changes: 0 additions & 11 deletions plugins/editors/tinymce/form/setoptions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,6 @@
label="PLG_TINY_FIELD_SKIN_ADMIN_LABEL"
/>

<field
name="mobile"
type="radio"
label="PLG_TINY_FIELD_MOBILE_LABEL"
class="switcher"
default="0"
>
<option value="0">JOFF</option>
<option value="1">JON</option>
</field>

<field
name="drag_drop"
type="radio"
Expand Down
14 changes: 0 additions & 14 deletions plugins/editors/tinymce/tinymce.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,20 +641,6 @@ public function onDisplay(
array('title' => 'Tag', 'value' => 'tag'),
);

/**
* Shrink the buttons if not on a mobile or if mobile view is off.
* If mobile view is on force into simple mode and enlarge the buttons
*/
if (!$this->app->client->mobile)
{
$scriptOptions['toolbar_items_size'] = 'small';
}
elseif ($levelParams->get('mobile', 0))
{
$scriptOptions['menubar'] = false;
unset($scriptOptions['toolbar2']);
}

$options['tinyMCE']['default'] = $scriptOptions;

$doc->addScriptOptions('plg_editor_tinymce', $options);
Expand Down