Merge branch 'master' into stories/DT/snippetpreviewUX

Conflicts: dist/yoast-seo.min.js
Yoast · Oct 1, 2015 · 73257d7 · 73257d7
2 parents 8776431 + c14144f
commit 73257d7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,5 @@
+### 1.0-beta2: September 23st, 2015
+* Fixes a bug where the slug wasn't taken into account when checking if the url contains the focus keyword.
+
 ### 1.0-beta: September 21st, 2015
 * Initial beta release
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "yoast-seo",
-  "version": "1.0-beta",
+  "version": "1.0-beta2",
   "homepage": "https://github.com/Yoast/yoast-seo",
   "authors": [
     "Yoast.com"

diff --git a/dist/yoast-seo.js b/dist/yoast-seo.js
@@ -2297,7 +2297,7 @@ YoastSEO.SnippetPreview.prototype.formatTitle = function() {
  * @returns formatted url
  */
 YoastSEO.SnippetPreview.prototype.formatUrl = function() {
-	var url = this.refObj.rawData.url;
+	var url = this.refObj.rawData.baseUrl;
 
 	//removes the http(s) part of the url
 	url.replace( /https?:\/\//ig, "" );

diff --git a/dist/yoast-seo.min.js b/dist/yoast-seo.min.js
diff --git a/js/snippetPreview.js b/js/snippetPreview.js
@@ -71,7 +71,7 @@ YoastSEO.SnippetPreview.prototype.formatTitle = function() {
  * @returns formatted url
  */
 YoastSEO.SnippetPreview.prototype.formatUrl = function() {
-	var url = this.refObj.rawData.url;
+	var url = this.refObj.rawData.baseUrl;
 
 	//removes the http(s) part of the url
 	url.replace( /https?:\/\//ig, "" );