Take page as default for rendering the snippet title.

Yoast · Nov 9, 2015 · 1cf3e23 · 1cf3e23
1 parent 20693e6
commit 1cf3e23
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/dist/yoast-seo.js b/dist/yoast-seo.js
@@ -2271,7 +2271,7 @@ YoastSEO.SnippetPreview = function( refObj ) {
 	this.unformattedText = {
 		snippet_cite: this.refObj.rawData.snippetCite || "",
 		snippet_meta: this.refObj.rawData.snippetMeta || "",
-		snippet_title: this.refObj.rawData.snippetTitle || ""
+		snippet_title: this.refObj.rawData.pageTitle || ""
 	};
 	this.init();
 };
@@ -2309,10 +2309,8 @@ YoastSEO.SnippetPreview.prototype.htmlOutput = function() {
  * @returns {String}
  */
 YoastSEO.SnippetPreview.prototype.formatTitle = function() {
-	var title = this.refObj.rawData.snippetTitle;
-	if ( title === "" || typeof title === "undefined" ) {
-		title = this.refObj.rawData.pageTitle;
-	}
+	var title = this.refObj.rawData.pageTitle;
+
 	if ( title === "" || typeof title === "undefined" ) {
 		title = this.refObj.config.sampleText.title;
 	}

diff --git a/dist/yoast-seo.min.js b/dist/yoast-seo.min.js
diff --git a/example/example-scraper.js b/example/example-scraper.js
@@ -25,7 +25,6 @@ YoastSEO.ExampleScraper.prototype.getData = function() {
 		baseUrl: this.getDataFromInput("baseUrl"),
 		url: this.getDataFromInput("url"),
 		pageTitle: this.getDataFromInput("title"),
-		snippetTitle: this.getDataFromInput("title"),
 		snippetMeta: this.getDataFromInput("meta"),
 		snippetCite: this.getDataFromInput("url")
 	};

diff --git a/example/example-scraper.min.js b/example/example-scraper.min.js
diff --git a/js/analyzer.js b/js/analyzer.js
@@ -12,7 +12,6 @@ YoastSEO = ( "undefined" === typeof YoastSEO ) ? {} : YoastSEO;
  * @param {String} args.title The actual title of the page.
  * @param {String} args.url The full URL that the page will be displayed on.
  * @param {String} args.excerpt The page excerpt.
- * @param {String} args.snippetTitle The title as displayed in the snippet preview.
  * @param {String} args.snippetMeta The meta description as displayed in the snippet preview.
  * @param {String} args.snippetCite  The URL as displayed in the snippet preview.
  *

diff --git a/js/snippetPreview.js b/js/snippetPreview.js
@@ -18,7 +18,7 @@ YoastSEO.SnippetPreview = function( refObj ) {
 	this.unformattedText = {
 		snippet_cite: this.refObj.rawData.snippetCite || "",
 		snippet_meta: this.refObj.rawData.snippetMeta || "",
-		snippet_title: this.refObj.rawData.snippetTitle || ""
+		snippet_title: this.refObj.rawData.pageTitle || ""
 	};
 	this.init();
 };
@@ -56,10 +56,8 @@ YoastSEO.SnippetPreview.prototype.htmlOutput = function() {
  * @returns {String}
  */
 YoastSEO.SnippetPreview.prototype.formatTitle = function() {
-	var title = this.refObj.rawData.snippetTitle;
-	if ( title === "" || typeof title === "undefined" ) {
-		title = this.refObj.rawData.pageTitle;
-	}
+	var title = this.refObj.rawData.pageTitle;
+
 	if ( title === "" || typeof title === "undefined" ) {
 		title = this.refObj.config.sampleText.title;
 	}