-
+
-
-
-
+
-
+
-
-
+
+
-
+
-
+
+ {{(showEditSocial)? "Hide Preview" : "Edit Preview"}}
+
-
+ {{searchHost}}{{searchUrl}}
-
-
+
+
+ {{searchHost}}{{searchUrl}}
+
+
-
-
+
-
-
-
-
- The title will appear in the browser tab and as the first line in search results.
+
-
-
-
-
-
- {{ model.value.title.length}} / 60
-
-
-
-
-
-
- The description provides a brief summary of a web page and is shown under the title in search results.
-
-
-
-
+
+ {{ model.value.description.length}} / 160
+
-
-
+
-
-
+
+
+ The title will appear in the browser tab and as the first line in search results.
-
-
-
-
+
-
+
+
-
-
-
+
- {{ model.value.title.length}} / 60
+
+
-
+
+ +
+
+ The description provides a brief summary of a web page and is shown under the title in search results.
+
+
+ +
+
-
+
+
+
+ {{(model.value.noIndex)? "Discorage search engines from indexing this page" : "Allow search engines to index this page"}}
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
+
-
+
+
+ {{(showEditSocial)? "Hide Preview" : "Edit Preview"}}
+
-
-
-
+
+
+
+
+
+ Facebook
+
+
+
+
+
+
+
+
+ Twitter
+
+
+
+
+
+ LinkedIn
+
+
+
+
+
+
+
+
+
+
+
+
![]()
@@ -127,10 +146,10 @@
-
+
- ![]()
+ ![]()
@@ -149,10 +168,10 @@
-
+
+
net6.0
enable
enable
+
+
-
@@ -24,6 +28,12 @@
+
+
diff --git a/MetaMomentum.UmbracoV8/App_Data/Models/all.dll.path b/MetaMomentum.UmbracoV8/App_Data/Models/all.dll.path
index f53cd0a..f17664f 100644
--- a/MetaMomentum.UmbracoV8/App_Data/Models/all.dll.path
+++ b/MetaMomentum.UmbracoV8/App_Data/Models/all.dll.path
@@ -1 +1 @@
-C:\Users\david\AppData\Local\Temp\Temporary ASP.NET Files\vs\612bcd59\7ae4fdd\App_Web_all.generated.cs.8f9494c4.r-pnlrz1.dll
\ No newline at end of file
+C:\Users\david\AppData\Local\Temp\Temporary ASP.NET Files\vs\612bcd59\7ae4fdd\App_Web_all.generated.cs.8f9494c4.lfsezqvu.dll
\ No newline at end of file
diff --git a/MetaMomentum.UmbracoV8/App_Data/Umbraco.sdf b/MetaMomentum.UmbracoV8/App_Data/Umbraco.sdf
index 7a87d5b..7ad3cd0 100644
Binary files a/MetaMomentum.UmbracoV8/App_Data/Umbraco.sdf and b/MetaMomentum.UmbracoV8/App_Data/Umbraco.sdf differ
diff --git a/MetaMomentum.UmbracoV8/Media/created-packages/Meta_Momentum_2.2.0.zip b/MetaMomentum.UmbracoV8/Media/created-packages/Meta_Momentum_2.2.0.zip
new file mode 100644
index 0000000..1a1d9c5
Binary files /dev/null and b/MetaMomentum.UmbracoV8/Media/created-packages/Meta_Momentum_2.2.0.zip differ
diff --git a/MetaMomentum.UmbracoV9/umbraco/Data/Umbraco.sdf b/MetaMomentum.UmbracoV9/umbraco/Data/Umbraco.sdf
index 07385bf..b12ceed 100644
Binary files a/MetaMomentum.UmbracoV9/umbraco/Data/Umbraco.sdf and b/MetaMomentum.UmbracoV9/umbraco/Data/Umbraco.sdf differ
diff --git a/MetaMomentum.sln b/MetaMomentum.sln
index bf6204d..9ce1f87 100644
--- a/MetaMomentum.sln
+++ b/MetaMomentum.sln
@@ -6,8 +6,10 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution files", "Solution files", "{EDA63525-2430-4F8E-BA25-A62334658E0A}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
+ gulpfile.js = gulpfile.js
readme.md = readme.md
readme.nuget.md = readme.nuget.md
+ umbraco-marketplace.json = umbraco-marketplace.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{BB8F5612-BAD2-4C50-B000-77B528FF42A0}"
@@ -25,7 +27,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetaMomentum.UmbracoV8", "M
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetaMomentum.Core", "MetaMomentum.Core\MetaMomentum.Core.csproj", "{CE173229-3B5C-49AF-AF0B-3A0ABAD76291}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetaMomentum.UmbracoV10", "MetaMomentum.UmbracoV10\MetaMomentum.UmbracoV10.csproj", "{FD666001-34C9-4CBD-B1A1-E480ABCF4DAE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetaMomentum.UmbracoV10", "MetaMomentum.UmbracoV10\MetaMomentum.UmbracoV10.csproj", "{FD666001-34C9-4CBD-B1A1-E480ABCF4DAE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/MetaMomentum/App_Plugins/MetaMomentum/editorView.controller.js b/MetaMomentum/App_Plugins/MetaMomentum/editorView.controller.js
index 3b73a8a..71473e6 100644
--- a/MetaMomentum/App_Plugins/MetaMomentum/editorView.controller.js
+++ b/MetaMomentum/App_Plugins/MetaMomentum/editorView.controller.js
@@ -1,11 +1,26 @@
-var bob = null
angular.module("umbraco")
.controller("DM.MetaMomentum",
function ($scope, $filter, editorState, contentEditingHelper, editorService, mediaHelper, entityResource, $interval) {
+ var shareImgUpdateInterval;
+
$scope.sharePreviewType = null;
$scope.showEditSearch = false;
$scope.showEditSocial = false;
+
+
+ $scope.$on('$destroy', function iVeBeenDismissed() {
+ // say goodbye to your controller here
+ // release resources, cancel request...
+ if (angular.isDefined(shareImgUpdateInterval)) {
+ //Stop interval function from updating share image
+ $interval.cancel(shareImgUpdateInterval);
+ shareImgUpdateInterval = undefined;
+
+ }
+
+ })
+
if ($scope.model.config.showSocialPreviewFacebook == 1) {
$scope.sharePreviewType = "facebook";
@@ -93,7 +108,7 @@ angular.module("umbraco")
}
//Todo: Need to find a better way of checking if a fallback property has changed. Works for text but not images
- $interval($scope.updateShareImage, 3000);
+ shareImgUpdateInterval = $interval($scope.updateShareImage, 3000);
}
function getPositionInString(string, subString, index) {
@@ -114,7 +129,7 @@ angular.module("umbraco")
if (typeof properties[p] !== "undefined" && properties[p].alias === fallbackTitles[i]) {
if (typeof properties[p].value !== "undefined" && properties[p].value !== "" && properties[p].value !== null)
//Found a fallback property value
- $scope.model.value.title = properties[p].value;
+ $scope.model.value.title = $filter('momentumStripHtml')(properties[p].value, true);
}
}
}
@@ -149,7 +164,7 @@ angular.module("umbraco")
if (typeof properties[p] !== "undefined" && properties[p].alias === fallbackDescriptions[i]) {
if (typeof properties[p].value !== "undefined" && properties[p].value !== "" && properties[p].value !== null)
//Found a fallback property value
- $scope.model.value.description = properties[p].value;
+ $scope.model.value.description = $filter('momentumStripHtml')(properties[p].value, true);
}
}
}
@@ -317,7 +332,7 @@ angular.module("umbraco")
multiPicker: false,
submit: function (imgmodel) {
editorService.close();
- console.log(imgmodel.selection[0])
+
$scope.model.value.share.image = imgmodel.selection[0];
$scope.model.value.share.imageUrl = imgmodel.selection[0].image;
@@ -353,5 +368,23 @@ angular.module("umbraco")
});
}
+ $scope.openSocialPreview = function () {
+ $scope.showEditSocial = true;
+ document.querySelector('#SocialPreview').scrollIntoView({
+ behavior: 'smooth'
+ });
+ }
+
+ $scope.toggleAllowSearchEngines = function (e) {
+ console.log(e)
+ e.preventDefault();
+ $scope.model.value.noIndex = !$scope.model.value.noIndex;
+ console.log($scope.model.value.noIndex)
+ }
+
+ $scope.test = function (evt) {
+ console.log(evt)
+ }
+
init();
});
\ No newline at end of file
diff --git a/MetaMomentum/App_Plugins/MetaMomentum/editorView.html b/MetaMomentum/App_Plugins/MetaMomentum/editorView.html
index d1da433..55b8440 100644
--- a/MetaMomentum/App_Plugins/MetaMomentum/editorView.html
+++ b/MetaMomentum/App_Plugins/MetaMomentum/editorView.html
@@ -1,116 +1,135 @@
-
- ![]()
+ ![]()
-
-
-
-
-
-
-
-
diff --git a/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/metamomentum.css b/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/metamomentum.css
index 9ee7584..d3bc1e0 100644
--- a/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/metamomentum.css
+++ b/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/metamomentum.css
@@ -1,4 +1,4 @@
-
+
.mm-hidden-fields {
@@ -16,8 +16,8 @@
.mm-preview-header {
- width: 610px !important;
display: block;
+ width:100%;
}
.mm-preview-header button.btn-link {
@@ -39,3 +39,6 @@
}
+.mm-controls {
+ max-width: 800px;
+}
\ No newline at end of file
diff --git a/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/package.manifest b/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/package.manifest
index 723d03f..27ff73f 100644
--- a/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/package.manifest
+++ b/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/package.manifest
@@ -1,4 +1,4 @@
-{
+{
"propertyEditors": [
{
"alias": "DM.MetaMomentum",
@@ -95,6 +95,8 @@
"~/App_Plugins/MetaMomentum/metamomentum.css"
],
"javascript": [
- "~/App_Plugins/MetaMomentum/editorView.controller.js"
+ "~/App_Plugins/MetaMomentum/uui-loader.js",
+ "~/App_Plugins/MetaMomentum/editorView.controller.js",
+ "~/App_Plugins/MetaMomentum/stripHtml.filter.js"
]
}
\ No newline at end of file
diff --git a/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/stripHtml.filter.js b/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/stripHtml.filter.js
new file mode 100644
index 0000000..1324b4b
--- /dev/null
+++ b/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/stripHtml.filter.js
@@ -0,0 +1,32 @@
+/**
+ * @description
+ * removes html tags from HTML string to produce only text. Additional "stripLineBreaks" parameter will remove all line breaks as well
+ */
+
+(function () {
+ 'use strict';
+
+ function momentumStripHtml() {
+ return function (htmlString, stripLineBreaks) {
+
+ if (!Utilities.isString(htmlString)) {
+ return "";
+ }
+
+ if (Utilities.isUndefined(htmlString)) {
+ return "";
+ }
+
+
+ var retVal = String(htmlString).replace(/<[^>]+>/gm, '');
+ if (stripLineBreaks) {
+ retVal = retVal.replace(/\r?\n|\r/g, ' '); //replace line break with a space
+ }
+
+ return retVal;
+ };
+ }
+
+ angular.module('umbraco.filters').filter('momentumStripHtml', momentumStripHtml);
+
+})();
\ No newline at end of file
diff --git a/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/uui-loader.js b/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/uui-loader.js
new file mode 100644
index 0000000..3236145
--- /dev/null
+++ b/MetaMomentum.UmbracoV10/App_Plugins/MetaMomentum/uui-loader.js
@@ -0,0 +1,5 @@
+if (typeof uui === 'undefined') {
+ var script = document.createElement('script');
+ script.src = "https://cdn.jsdelivr.net/npm/@umbraco-ui/uui@latest/dist/uui.min.js";
+ document.head.appendChild(script);
+}
\ No newline at end of file
diff --git a/MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj b/MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj
index cb5f541..f6002fe 100644
--- a/MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj
+++ b/MetaMomentum.UmbracoV10/MetaMomentum.UmbracoV10.csproj
@@ -1,12 +1,16 @@
-
@@ -166,21 +185,8 @@
-
-
-
-
+
-
-
@@ -188,7 +194,7 @@
-
+
-
- {{ model.value.shareTitle.length}} / 60
@@ -201,15 +207,12 @@
The share description shown under the title when shared.
+
-
-
-
@@ -221,47 +224,16 @@
{{ model.value.shareDescription.length}} / 160
-
+
-
-
+ Trashed
+
+ Remove
+
+ ![]()
+
@@ -274,8 +246,7 @@
-
-
+ -
-
-
-
-
-
-
-
- - - -
- - --
- - - - -
-
+
-
-
-
+
-
+
-
-
+
+
-
+
-
+
+ {{(showEditSocial)? "Hide Preview" : "Edit Preview"}}
+
-
+ {{searchHost}}{{searchUrl}}
-
-
+
+
+ {{searchHost}}{{searchUrl}}
+
+
-
-
+
-
-
-
-
- The title will appear in the browser tab and as the first line in search results.
+
-
-
-
-
-
- {{ model.value.title.length}} / 60
-
-
-
-
-
-
- The description provides a brief summary of a web page and is shown under the title in search results.
-
-
-
-
+
+ {{ model.value.description.length}} / 160
+
-
-
+
-
-
+
+
+ The title will appear in the browser tab and as the first line in search results.
-
-
-
-
+
-
+
+
-
-
-
+
- {{ model.value.title.length}} / 60
+
+
-
+
+ +
+
+ The description provides a brief summary of a web page and is shown under the title in search results.
+
+
+ +
+
-
+
+
+
+ {{(model.value.noIndex)? "Discorage search engines from indexing this page" : "Allow search engines to index this page"}}
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
+
-
+
+
+ {{(showEditSocial)? "Hide Preview" : "Edit Preview"}}
+
-
-
-
+
+
+
+
+
+ Facebook
+
+
+
+
+
+
+
+
+ Twitter
+
+
+
+
+
+ LinkedIn
+
+
+
+
+
+
+
+
+
+
+
+
![]()
@@ -127,10 +146,10 @@
-
+
- ![]()
+ ![]()
@@ -149,10 +168,10 @@
-
+ False
none
- 2.1.1
+ 2.2.0
Creates a Meta DataType for Umbraco 8, 9 and 10 to manage Search Engine results, Open Graph and Twitter Cards
Digital Momentum
MetaMomentum for Umbraco 8, 9 & 10
@@ -26,9 +26,11 @@
True
readme.nuget.md
disable
- - Update for Umbraco 10 release
-- Fixed dirty warning when switching between previews
-- Option to hide No Index toggle in setitngs
+
+ - Update UI to use the new Umbraco UI Library
+ - RTE / Html fallbacks now strip the HTML tags
+ - Bug Fixes and performance inprovements
+
@@ -56,6 +58,10 @@
+
+
+
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000..45f667a
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,33 @@
+///
- ![]()
+ ![]()
-
-
-
-
-
-
-
-
diff --git a/MetaMomentum/App_Plugins/MetaMomentum/metamomentum.css b/MetaMomentum/App_Plugins/MetaMomentum/metamomentum.css
index 9ee7584..d3bc1e0 100644
--- a/MetaMomentum/App_Plugins/MetaMomentum/metamomentum.css
+++ b/MetaMomentum/App_Plugins/MetaMomentum/metamomentum.css
@@ -1,4 +1,4 @@
-
+
.mm-hidden-fields {
@@ -16,8 +16,8 @@
.mm-preview-header {
- width: 610px !important;
display: block;
+ width:100%;
}
.mm-preview-header button.btn-link {
@@ -39,3 +39,6 @@
}
+.mm-controls {
+ max-width: 800px;
+}
\ No newline at end of file
diff --git a/MetaMomentum/App_Plugins/MetaMomentum/package.manifest b/MetaMomentum/App_Plugins/MetaMomentum/package.manifest
index 723d03f..27ff73f 100644
--- a/MetaMomentum/App_Plugins/MetaMomentum/package.manifest
+++ b/MetaMomentum/App_Plugins/MetaMomentum/package.manifest
@@ -1,4 +1,4 @@
-{
+{
"propertyEditors": [
{
"alias": "DM.MetaMomentum",
@@ -95,6 +95,8 @@
"~/App_Plugins/MetaMomentum/metamomentum.css"
],
"javascript": [
- "~/App_Plugins/MetaMomentum/editorView.controller.js"
+ "~/App_Plugins/MetaMomentum/uui-loader.js",
+ "~/App_Plugins/MetaMomentum/editorView.controller.js",
+ "~/App_Plugins/MetaMomentum/stripHtml.filter.js"
]
}
\ No newline at end of file
diff --git a/MetaMomentum/App_Plugins/MetaMomentum/stripHtml.filter.js b/MetaMomentum/App_Plugins/MetaMomentum/stripHtml.filter.js
new file mode 100644
index 0000000..ad30079
--- /dev/null
+++ b/MetaMomentum/App_Plugins/MetaMomentum/stripHtml.filter.js
@@ -0,0 +1,32 @@
+/**
+ * @description
+ * removes html tags from HTML string to produce only text. Additional "stripLineBreaks" parameter will remove all line breaks as well
+ */
+
+(function () {
+ 'use strict';
+
+ function momentumStripHtml() {
+ return function (htmlString, stripLineBreaks) {
+
+ if (!Utilities.isString(htmlString)) {
+ return "";
+ }
+
+ if (Utilities.isUndefined(htmlString)) {
+ return "";
+ }
+
+
+ var retVal = String(htmlString).replace(/<[^>]+>/gm, '');
+ if (stripLineBreaks) {
+ retVal = retVal.replace(/\r?\n|\r/g, ' '); //replace line break with a space
+ }
+
+ return retVal;
+ };
+ }
+
+ angular.module('umbraco.filters').filter('momentumStripHtml', momentumStripHtml);
+
+})();
\ No newline at end of file
diff --git a/MetaMomentum/App_Plugins/MetaMomentum/uui-loader.js b/MetaMomentum/App_Plugins/MetaMomentum/uui-loader.js
new file mode 100644
index 0000000..63a33f5
--- /dev/null
+++ b/MetaMomentum/App_Plugins/MetaMomentum/uui-loader.js
@@ -0,0 +1,5 @@
+if (typeof uui === 'undefined') {
+ var script = document.createElement('script');
+ script.src = "https://cdn.jsdelivr.net/npm/@umbraco-ui/uui@latest/dist/uui.min.js";
+ document.head.appendChild(script);
+}
\ No newline at end of file
diff --git a/MetaMomentum/MetaMomentum.csproj b/MetaMomentum/MetaMomentum.csproj
index b7d5716..fbe00eb 100644
--- a/MetaMomentum/MetaMomentum.csproj
+++ b/MetaMomentum/MetaMomentum.csproj
@@ -10,7 +10,7 @@
@@ -166,21 +185,8 @@
-
-
-
-
+
-
-
@@ -188,7 +194,7 @@
-
+
-
- {{ model.value.shareTitle.length}} / 60
@@ -201,15 +207,12 @@
The share description shown under the title when shared.
+
-
-
-
@@ -221,47 +224,16 @@
{{ model.value.shareDescription.length}} / 160
-
+
-
-
+ Trashed
+
+ Remove
+
+ ![]()
+
@@ -274,8 +246,7 @@
-
-
+ -
-
-
-
-
-
-
-
- - - -
- - --
- - - - -