Skip to content

Commit

Permalink
Added support for Solspace Calendar
Browse files Browse the repository at this point in the history
Fixed #184
  • Loading branch information
Tam committed Jan 28, 2019
1 parent 08971f5 commit 81b836d
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 7 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [Unreleased] 3.5.4

### Added
- Added support for Solspace Calendar [#184]

[#184]: https://github.com/ethercreative/seo/issues/184

## 3.5.3 - 2019-01-23

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ether/seo",
"license": "MIT",
"description": "SEO utilities including a unique field type, sitemap, & redirect manager",
"version": "3.5.3",
"version": "3.5.4",
"type": "craft-plugin",
"minimum-stability": "dev",
"require": {
Expand Down
16 changes: 16 additions & 0 deletions src/fields/SeoField.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ public function getInputHtml ($value, ElementInterface $element = null): string
$hasPreview = false;
$section = null;
$isEntry = false;
$isCalendar = false;
$isHome = false;
$isNew = $element->getId() === null;
$isSingle = false;
Expand All @@ -152,6 +153,17 @@ public function getInputHtml ($value, ElementInterface $element = null): string
'commerce/products-preview/preview-product'
);
break;
case 'Solspace\\Calendar\\Elements\\Event':
/** @var $element \Solspace\Calendar\Elements\Event */
$isCalendar = true;
$previewAction = $craft->getSecurity()->hashData(
'calendar/events/preview'
);
$hasPreview = \Solspace\Calendar\Calendar::getInstance()->calendars->isEventTemplateValid(
$element->getCalendar(),
$element->siteId
);
break;
default:
/** @var ElementInterface $element */
}
Expand Down Expand Up @@ -181,6 +193,8 @@ public function getInputHtml ($value, ElementInterface $element = null): string
// Social URL
// ---------------------------------------------------------------------

$socialPreviewUrl = null;

if ($craft->sites->currentSite->baseUrl) {
preg_match(
"((http?s?:\/\/)?(www.)?(.*)\/)",
Expand Down Expand Up @@ -213,6 +227,8 @@ public function getInputHtml ($value, ElementInterface $element = null): string

if ($element instanceof Category)
$renderData['groupId'] = $element->groupId;
elseif ($isCalendar)
$renderData['calendarId'] = $element->calendarId;
else
$renderData['typeId'] = $element->typeId;

Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/js/SeoField.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/js/SeoField.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/js/SeoFieldSettings.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/js/SeoFieldSettings.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/js/SeoSettings.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/js/SeoSettings.min.js.map

Large diffs are not rendered by default.

0 comments on commit 81b836d

Please sign in to comment.