Skip to content

Commit

Permalink
Merge pull request silverstripe#128 from torleif/patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@dhensby
dhensby committed Jul 13, 2016
2 parents 9e2b4f1 + 987d293 commit 36ccdf2
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 55 deletions.
64 changes: 36 additions & 28 deletions code/model/Widget.php
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php

/**
* Widgets let CMS authors drag and drop small pieces of functionality into
* Widgets let CMS authors drag and drop small pieces of functionality into
* defined areas of their websites.
*
*
* You can use forms in widgets by implementing a {@link WidgetController}.
*
*
* See {@link Widget_Controller} for more information.
*
*
* @package widgets
*/
class Widget extends DataObject
Expand All @@ -16,6 +16,7 @@ class Widget extends DataObject
* @var array
*/
private static $db = array(
"Title" => "Varchar(255)",
"Title" => "Varchar(255)",
"Sort" => "Int",
"Enabled" => "Boolean",
Expand All @@ -35,7 +36,7 @@ class Widget extends DataObject
'CMSTitle' => 'Text',
'Description' => 'Text',
);

private static $only_available_in = array();

/**
Expand Down Expand Up @@ -82,10 +83,10 @@ public function populateDefaults()
parent::populateDefaults();
$this->setField('Title', $this->getTitle());
}

/**
* Note: Overloaded in {@link WidgetController}.
*
*
* @return string HTML
*/
public function WidgetHolder()
Expand All @@ -102,18 +103,19 @@ public function forTemplate($holder = true)
if ($holder) {
return $this->WidgetHolder();
}

return $this->Content();
}

/**
* Renders the widget content in a custom template with the same name as the
* Renders the widget content in a custom template with the same name as the
* current class. This should be the main point of output customization.
*
* Invoked from within WidgetHolder.ss, which contains the "framing" around
*
* Invoked from within WidgetHolder.ss, which contains the "framing" around
* the custom content, like a title.
*
*
* Note: Overloaded in {@link WidgetController}.
*
*
* @return string HTML
*/
public function Content()
Expand All @@ -138,7 +140,7 @@ public function Title()
public function getTitle()
{
return $this->getField('Title')
?: _t($this->class.'.TITLE', $this->config()->title);
?: _t($this->class . '.TITLE', $this->config()->title);
}

/**
Expand All @@ -155,7 +157,7 @@ public function CMSTitle()
*/
public function getCMSTitle()
{
return _t($this->class.'.CMSTITLE', $this->config()->cmsTitle);
return _t($this->class . '.CMSTITLE', $this->config()->cmsTitle);
}

/**
Expand All @@ -172,7 +174,7 @@ public function Description()
*/
public function getDescription()
{
return _t($this->class.'.DESCRIPTION', $this->config()->description);
return _t($this->class . '.DESCRIPTION', $this->config()->description);
}

/**
Expand All @@ -182,7 +184,7 @@ public function DescriptionSegment()
{
return $this->renderWith('WidgetDescription');
}

/**
* @see WidgetController::editablesegment()
*
Expand All @@ -203,9 +205,10 @@ public function getCMSFields()
new CheckboxField('Enabled', $this->fieldLabel('Enabled'))
);
$this->extend('updateCMSFields', $fields);

return $fields;
}

/**
* @return FieldList
*/
Expand All @@ -214,14 +217,19 @@ public function CMSEditor()
$fields = $this->getCMSFields();
$outputFields = new FieldList();

$this->FormID = $this->FormID ?: uniqid();
$outputFields->push(HiddenField::create('Widget[' . $this->FormID . '][FormID]', 'FormID',
$this->FormID)->addExtraClass('formid'));

foreach ($fields as $field) {
$name = $field->getName();
$value = $this->getField($name);
if ($value) {
$field->setValue($value);
}
$name = preg_replace("/([A-Za-z0-9\-_]+)/", "Widget[" . $this->ID . "][\\1]", $name);
$field->setName($name);
$namefiltered = preg_replace("/([A-Za-z0-9\-_]+)/", "Widget[" . $this->FormID . "][\\1]", $name);

$field->setName($namefiltered);
$outputFields->push($field);
}

Expand All @@ -241,7 +249,7 @@ public function ClassName()
*/
public function Name()
{
return "Widget[".$this->ID."]";
return "Widget[" . $this->ID . "]";
}

/**
Expand All @@ -257,13 +265,13 @@ public function getController()

foreach (array_reverse(ClassInfo::ancestry($this->class)) as $widgetClass) {
$controllerClass = "{$widgetClass}_Controller";

if (class_exists($controllerClass)) {
break;
}

$controllerClass = "{$widgetClass}Controller";

if (class_exists($controllerClass)) {
break;
}
Expand All @@ -277,7 +285,7 @@ public function getController()

return $this->controller;
}

/**
* @param array $data
*/
Expand All @@ -294,19 +302,19 @@ public function populateFromPostData($data)
}
}
}

//Look for checkbox fields not present in the data
foreach ($fields as $field) {
if ($field instanceof CheckboxField && !array_key_exists($field->getName(), $data)) {
$field->setValue(false);
$field->saveInto($this);
}
}

$this->write();

// The field must be written to ensure a unique ID.
$this->Name = $this->class.$this->ID;
$this->Name = $this->class . $this->ID;
$this->write();
}
}
30 changes: 3 additions & 27 deletions javascript/WidgetAreaEditor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,7 @@
})
}
});

// Figure out maxid, this is used when creating new widgets
$(this).data('maxid', 0);

var usedWidgets = $(this).find('.usedWidgets .Widget');
usedWidgets.each(function() {
var widget = $(this)[0];
if(widget.id) {
widgetid = widget.id.match(/Widget\[(.+?)\]\[([0-9]+)\]/i);
if(widgetid && parseInt(widgetid[2]) > parseInt(parentRef.data('maxid'))) {
parentRef.data('maxid', parseInt(widgetid[2]));
}
}
});



// Ensure correct sort values are written when page is saved
// TODO Adjust to new event listeners
$('.cms-container').bind('submitform', function(e) {parentRef.beforeSave(e)});
Expand All @@ -72,17 +57,13 @@
if (!widget.rewritten && (widget.id || widget.name)) {
if (widget.id && widget.id.indexOf('Widget[') === 0) {
var newValue = widget.id.replace(/Widget\[/, 'Widget['+name+'][');
//console.log('Renaming '+widget.tagName+' ID '+widget.id+' to '+newValue);
widget.id = newValue;
}
if (widget.name && widget.name.indexOf('Widget[') === 0) {
var newValue = widget.name.replace(/Widget\[/, 'Widget['+name+'][');
//console.log('Renaming '+widget.tagName+' Name '+widget.name+' to '+newValue);
widget.name=newValue;
}
widget.rewritten='yes';
}else {
//console.log('Skipping '+(widget.id ? widget.id : (widget.name ? widget.name : 'unknown '+widget.tagName)));
}
});
}
Expand Down Expand Up @@ -144,13 +125,8 @@
},

insertWidgetEditor: function(response) {
var usedWidgets = $('#usedWidgets-'+$(this).attr('name')).children();

// Give the widget a unique id
var newID=parseInt($(this).data('maxid'))+1;
$(this).data('maxid', newID);

var widgetContent = response.replace(/Widget\[0\]/gi, "Widget[new-" + (newID) + "]");
var newID = $(response).find('.formid').val();
var widgetContent = response.replace(/Widget\[0\]/gi, "Widget[" + (newID) + "]");
$('#usedWidgets-'+$(this).attr('name')).append(widgetContent);

this.rewriteWidgetAreaAttributes();
Expand Down

0 comments on commit 36ccdf2

Please sign in to comment.