Skip to content
This repository was archived by the owner on Mar 8, 2021. It is now read-only.

TinyMCE4-support for chunk-editing #558

Merged
Dmi3yy merged 4 commits into from
Mar 17, 2016
Merged

TinyMCE4-support for chunk-editing #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccc2c92
TinyMCE4-support
Deesen Mar 16, 2016
01f2086
Improved tpl->tplVars back-button
Deesen Mar 17, 2016
4361faa
tpl/tvEdit: save&stay + save&exit + cancel return now to template whe…
Deesen Mar 17, 2016
a000801
Added "initBridge" and getPlaceholder()
Deesen Mar 17, 2016
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
22 changes: 17 additions & 5 deletions assets/lib/class.modxRTEbridge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,12 @@ public function setPlaceholder($ph, $value)
}
}

// Function to get custom-placeholders
public function getPlaceholder($ph)
{
return isset($this->customPlaceholders[$ph]) ? $this->customPlaceholders[$ph] : NULL;
}

// Set new/overwrite translations manually (via bridge)
public function setLang($key, $string, $overwriteExisting = false)
{
Expand Down Expand Up @@ -205,6 +211,9 @@ public function getEditorScript()

$this->pluginParams['elements'] = !is_array($this->pluginParams['elements']) ? explode(',', $this->pluginParams['elements']) : $this->pluginParams['elements']; // Allow setting via plugin-configuration

// Allows bridging elements+TV-options etc before looping
$this->renderBridgeParams('initBridge');

// Now loop through tvs
foreach ($this->pluginParams['elements'] as $selector) {

Expand Down Expand Up @@ -286,21 +295,24 @@ public function initTheme($selector)
}

// Call bridge-functions and receive optional bridged-values
// $selector = "initBridge" allows executing bridging function without modifying $this->themeConfig
public function renderBridgeParams($selector)
{
// Call functions - for optional translation of params/values via bridge.xxxxxxxxxx.inc.php
foreach ($this->bridgeParams as $editorParam => $editorKey) {
if (is_callable($this->bridgeParams[$editorParam])) { // Call function, get return
$return = $this->bridgeParams[$editorParam]();
if ($return !== NULL && isset($this->themeConfig[$editorParam])) {
$return = $this->bridgeParams[$editorParam]($selector);
if ($return !== NULL && isset($this->themeConfig[$editorParam]) && $selector !== 'initBridge') {
$this->themeConfig[$editorParam]['bridged'] = $return;
}
}
}
// Load Tv-Options as bridged-params
foreach($this->themeConfig as $key=>$conf) {
if (isset($this->tvOptions[$selector][$key])) {
$this->themeConfig[$key]['bridged'] = $this->tvOptions[$selector][$key];
if($selector !== 'initBridge') {
foreach ($this->themeConfig as $key => $conf) {
if (isset($this->tvOptions[$selector][$key])) {
$this->themeConfig[$key]['bridged'] = $this->tvOptions[$selector][$key];
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion manager/actions/mutate_htmlsnippet.dynamic.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ function deletedocument() {
<?php echo $_lang['chunk_code']?>
</div>
<div class="sectionBody">
<textarea dir="ltr" class="phptextarea" name="post" style="width:100%; height:370px;" onChange="documentDirty=true;"><?php echo isset($content['post']) ? $modx->htmlspecialchars($content['post']) : $modx->htmlspecialchars($content['snippet'])?></textarea>
<textarea dir="ltr" class="phptextarea" id="post" name="post" style="width:100%; height:370px;" onChange="documentDirty=true;"><?php echo isset($content['post']) ? $modx->htmlspecialchars($content['post']) : $modx->htmlspecialchars($content['snippet'])?></textarea>
</div>
</div>

Expand Down
8 changes: 4 additions & 4 deletions manager/actions/mutate_templates.dynamic.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ function deletedocument() {
foreach($selectedTvs as $row) {
$desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>('.$row['tvdescription'].')</small>' : '';
$locked = $row['tvlocked'] ? ' <em>('.$_lang['locked'].')</em>' : "" ;
$tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" class="inputBox" checked="checked" onchange="documentDirty=true;">%s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301">%s</a></li>',
$row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $_lang['edit']);
$tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" class="inputBox" checked="checked" onchange="documentDirty=true;">%s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>',
$row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
}
$tvList .= '</ul>';

Expand All @@ -248,8 +248,8 @@ function deletedocument() {

$desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>('.$row['tvdescription'].')</small>' : '';
$locked = $row['tvlocked'] ? ' <em>('.$_lang['locked'].')</em>' : "" ;
$tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" class="inputBox" onchange="documentDirty=true;">%s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301">%s</a></li>',
$row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $_lang['edit']);
$tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" class="inputBox" onchange="documentDirty=true;">%s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s">%s</a></li>',
$row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $_lang['edit']);
$tvList .= '</li>';

$preCat = $row['category'];
Expand Down
6 changes: 5 additions & 1 deletion manager/actions/mutate_tmplvars.dynamic.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
}

$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
$origin = isset($_REQUEST['or']) ? intval($_REQUEST['or']) : 76;
$originId = isset($_REQUEST['oid']) ? intval($_REQUEST['oid']) : NULL;

$tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
$tbl_site_templates = $modx->getFullTableName('site_templates');
Expand Down Expand Up @@ -252,6 +254,8 @@ function decode(s){
?>
<input type="hidden" name="id" value="<?php echo $content['id'];?>">
<input type="hidden" name="a" value="302">
<input type="hidden" name="or" value="<?php echo $origin;?>">
<input type="hidden" name="oid" value="<?php echo $originId;?>">
<input type="hidden" name="mode" value="<?php echo $_GET['a'];?>">
<input type="hidden" name="params" value="<?php echo $modx->htmlspecialchars($content['display_params']);?>">

Expand All @@ -277,7 +281,7 @@ function decode(s){
<li id="Button6"><a href="#" onclick="duplicaterecord();"><img src="<?php echo $_style["icons_resource_duplicate"] ?>" /> <?php echo $_lang["duplicate"]; ?></a></li>
<li id="Button3"><a href="#" onclick="deletedocument();"><img src="<?php echo $_style["icons_delete_document"]?>" /> <?php echo $_lang['delete']?></a></li>
<?php } ?>
<li id="Button5"><a href="#" onclick="documentDirty=false;document.location.href='index.php?a=76';"><img src="<?php echo $_style["icons_cancel"] ?>" /> <?php echo $_lang['cancel']?></a></li>
<li id="Button5"><a href="#" onclick="documentDirty=false;document.location.href='index.php?a=<?php echo $origin ?><?php echo ($originId!=NULL?'&id='.$originId:''); ?>';"><img src="<?php echo $_style["icons_cancel"] ?>" /> <?php echo $_lang['cancel']?></a></li>
</ul>
</div>

Expand Down
6 changes: 4 additions & 2 deletions manager/processors/save_tmplvars.processor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
$display = $modx->db->escape($_POST['display']);
$params = $modx->db->escape($_POST['params']);
$locked = $_POST['locked']=='on' ? 1 : 0 ;
$origin = isset($_REQUEST['or']) ? intval($_REQUEST['or']) : 76;
$originId = isset($_REQUEST['oid']) ? intval($_REQUEST['oid']) : NULL;

//Kyle Jaebker - added category support
if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
Expand Down Expand Up @@ -158,10 +160,10 @@
// finished emptying cache - redirect
if($_POST['stay']!='') {
$a = ($_POST['stay']=='2') ? "301&id=$id":"300";
$header="Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
$header="Location: index.php?a=".$a."&r=2&stay=".$_POST['stay']."&or=".$origin."&oid=".$originId;
header($header);
} else {
$header="Location: index.php?a=76&r=2";
$header="Location: index.php?a=".$origin."&r=2".($originId!=NULL?'&id='.$originId:'');
header($header);
}

Expand Down