Merge pull request TryGhost#2452 from ErisDS/typography

Removing typography extension
halfdan · Mar 20, 2014 · 45361e6 · 45361e6
2 parents 39957a7 + d8f724d
commit 45361e6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 124 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -461,7 +461,6 @@ var path           = require('path'),
                             'bower_components/validator-js/validator.js',
 
                             'core/client/assets/lib/showdown/extensions/ghostdown.js',
-                            'core/shared/lib/showdown/extensions/typography.js',
                             'core/shared/lib/showdown/extensions/github.js',
 
                             // ToDo: Remove or replace
@@ -524,7 +523,6 @@ var path           = require('path'),
                             'bower_components/validator-js/validator.js',
 
                             'core/client/assets/lib/showdown/extensions/ghostdown.js',
-                            'core/shared/lib/showdown/extensions/typography.js',
                             'core/shared/lib/showdown/extensions/github.js',
 
                             // ToDo: Remove or replace

diff --git a/core/client/assets/lib/editor/htmlPreview.js b/core/client/assets/lib/editor/htmlPreview.js
@@ -9,7 +9,7 @@
     'use strict';
 
     var HTMLPreview = function (markdown, uploadMgr) {
-        var converter = new Showdown.converter({extensions: ['typography', 'ghostdown', 'github']}),
+        var converter = new Showdown.converter({extensions: ['ghostdown', 'github']}),
             preview = document.getElementsByClassName('rendered-markdown')[0],
             update;
 

diff --git a/core/server/models/post.js b/core/server/models/post.js
@@ -4,8 +4,7 @@ var _              = require('lodash'),
     errors         = require('../errorHandling'),
     Showdown       = require('showdown'),
     github         = require('../../shared/lib/showdown/extensions/github'),
-    typography     = require('../../shared/lib/showdown/extensions/typography'),
-    converter      = new Showdown.converter({extensions: [typography, github]}),
+    converter      = new Showdown.converter({extensions: [github]}),
     User           = require('./user').User,
     Tag            = require('./tag').Tag,
     Tags           = require('./tag').Tags,

diff --git a/core/shared/lib/showdown/extensions/typography.js b/core/shared/lib/showdown/extensions/typography.js
diff --git a/core/test/functional/frontend/feed_test.js b/core/test/functional/frontend/feed_test.js
@@ -10,7 +10,7 @@ CasperTest.begin('Ensure that RSS is available', 11, function suite(test) {
             siteDescription = '<description><![CDATA[Just a blogging platform.]]></description>',
             siteUrl = '<link>http://127.0.0.1:2369/</link>',
             postTitle = '<![CDATA[Welcome to Ghost]]>',
-            postStart = '<description><![CDATA[<p>You’re live!',
+            postStart = '<description><![CDATA[<p>You\'re live!',
             postEnd = 'you think :)</p>]]></description>',
             postLink = '<link>http://127.0.0.1:2369/welcome-to-ghost/</link>',
             postCreator = '<dc:creator><![CDATA[Test User]]>';
@@ -29,17 +29,17 @@ CasperTest.begin('Ensure that RSS is available', 11, function suite(test) {
     });
 }, false);
 
-CasperTest.begin('Ensure that author element is not included. Only dc:creator', 3, function suite(test) {
+CasperTest.begin('Ensure that author element is not included. Only dc:creator', 3, function suite(test) {
     CasperTest.Routines.togglePermalinks.run('off');
-    casper.thenOpen(url + 'rss/', function (response) {
+    casper.thenOpen(url + 'rss/', function (response) {
         var content = this.getPageContent(),
             author = '<author>',
             postCreator = '<dc:creator><![CDATA[Test User]]>';
 
         test.assertEqual(response.status, 200, 'Response status should be 200.');
         test.assert(content.indexOf(author) < 0, 'Author element should not be included');
-        test.assert(content.indexOf(postCreator) >= 0, 'Welcome post should have Test User as the creator.');
-    });
+        test.assert(content.indexOf(postCreator) >= 0, 'Welcome post should have Test User as the creator.');
+    });
 }, false);
 
 CasperTest.begin('Ensures dated permalinks works with RSS', 2, function suite(test) {

diff --git a/core/test/unit/client_showdown_int_spec.js b/core/test/unit/client_showdown_int_spec.js
@@ -478,4 +478,19 @@ describe("Showdown client side converter", function () {
             processedMarkup.should.match(testPhrase.output);
         });
     });
+
+
+    //      Waiting for showdown typography to be updated
+    //    it("should correctly convert quotes to curly quotes", function () {
+    //        var testPhrases = [
+    //            {
+    //                input: "Hello world\nIt's a fine day\nout",
+    //                output: /^<p>Hello world <br \/>\nIt’s a fine day <br \/>\nout<\/p>$/}
+    //        ];
+    //
+    //        testPhrases.forEach(function (testPhrase) {
+    //            processedMarkup = converter.makeHtml(testPhrase.input);
+    //            processedMarkup.should.match(testPhrase.output);
+    //        });
+    //    })
 });