From d29e3763673285d2aae2d0c86574d5a2f8e66b2e Mon Sep 17 00:00:00 2001 From: Rish Date: Fri, 31 Aug 2018 11:05:27 +0100 Subject: [PATCH] Added kg-card class to mobiledoc cards No issue --- core/server/lib/mobiledoc/cards/embed.js | 2 +- core/server/lib/mobiledoc/cards/gallery.js | 2 +- core/server/lib/mobiledoc/cards/image.js | 2 +- .../data/importer/importers/data_spec.js | 4 ++-- core/test/unit/lib/mobiledoc/cards/embed_spec.js | 8 ++++---- core/test/unit/lib/mobiledoc/cards/gallery_spec.js | 2 +- core/test/unit/lib/mobiledoc/cards/image_spec.js | 14 +++++++------- .../converters/mobiledoc-converter_spec.js | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/server/lib/mobiledoc/cards/embed.js b/core/server/lib/mobiledoc/cards/embed.js index b3c893598c..f63e999a00 100644 --- a/core/server/lib/mobiledoc/cards/embed.js +++ b/core/server/lib/mobiledoc/cards/embed.js @@ -9,7 +9,7 @@ module.exports = { let {payload, env: {dom}} = opts; let figure = dom.createElement('figure'); - figure.setAttribute('class', 'kg-embed-card'); + figure.setAttribute('class', 'kg-card kg-embed-card'); let html = dom.createRawHTMLSection(payload.html); figure.appendChild(html); diff --git a/core/server/lib/mobiledoc/cards/gallery.js b/core/server/lib/mobiledoc/cards/gallery.js index 175fd490b0..9252a85bb6 100644 --- a/core/server/lib/mobiledoc/cards/gallery.js +++ b/core/server/lib/mobiledoc/cards/gallery.js @@ -30,7 +30,7 @@ module.exports = { } let figure = dom.createElement('figure'); - figure.setAttribute('class', 'kg-gallery-card kg-width-wide'); + figure.setAttribute('class', 'kg-card kg-gallery-card kg-width-wide'); let container = dom.createElement('div'); container.setAttribute('class', 'kg-gallery-container'); diff --git a/core/server/lib/mobiledoc/cards/image.js b/core/server/lib/mobiledoc/cards/image.js index 316411f0ae..0e71208a47 100644 --- a/core/server/lib/mobiledoc/cards/image.js +++ b/core/server/lib/mobiledoc/cards/image.js @@ -11,7 +11,7 @@ module.exports = { } let figure = dom.createElement('figure'); - let figureClass = 'kg-image-card'; + let figureClass = 'kg-card kg-image-card'; if (payload.cardWidth) { figureClass = `${figureClass} kg-width-${payload.cardWidth}`; } diff --git a/core/test/integration/data/importer/importers/data_spec.js b/core/test/integration/data/importer/importers/data_spec.js index a88a429032..760b757f0c 100644 --- a/core/test/integration/data/importer/importers/data_spec.js +++ b/core/test/integration/data/importer/importers/data_spec.js @@ -1387,10 +1387,10 @@ describe('1.0', function () { posts.length.should.eql(2); posts[0].mobiledoc.should.eql('{"version":"0.3.1","markups":[],"atoms":[],"cards":[["markdown",{"cardName":"markdown","markdown":"## Post Content"}],["image",{"src":"source2","cardWidth":"not-wide"}]],"sections":[[10,0],[10,1]]}'); - posts[0].html.should.eql('

Post Content

\n
'); + posts[0].html.should.eql('

Post Content

\n
'); posts[1].mobiledoc.should.eql('{"version":"0.3.1","markups":[],"atoms":[],"cards":[["image",{"src":"source","cardWidth":"wide"}],["markdown",{"cardName":"markdown","markdown":"# Post Content"}]],"sections":[[10,0],[10,1]]}'); - posts[1].html.should.eql('

Post Content

\n'); + posts[1].html.should.eql('

Post Content

\n'); }); }); }); diff --git a/core/test/unit/lib/mobiledoc/cards/embed_spec.js b/core/test/unit/lib/mobiledoc/cards/embed_spec.js index 939fcb2f99..142d9d0026 100644 --- a/core/test/unit/lib/mobiledoc/cards/embed_spec.js +++ b/core/test/unit/lib/mobiledoc/cards/embed_spec.js @@ -14,7 +14,7 @@ describe('Embed card', function () { } }; - serializer.serialize(card.render(opts)).should.match('

HEADING

PARAGRAPH

'); + serializer.serialize(card.render(opts)).should.match('

HEADING

PARAGRAPH

'); }); it('Plain content renders', function () { @@ -27,7 +27,7 @@ describe('Embed card', function () { } }; - serializer.serialize(card.render(opts)).should.match('
CONTENT
'); + serializer.serialize(card.render(opts)).should.match('
CONTENT
'); }); it('Invalid HTML returns', function () { @@ -40,7 +40,7 @@ describe('Embed card', function () { } }; - serializer.serialize(card.render(opts)).should.match('

HEADING<

'); + serializer.serialize(card.render(opts)).should.match('

HEADING<

'); }); it('Renders nothing when payload is undefined', function () { @@ -67,6 +67,6 @@ describe('Embed card', function () { } }; - serializer.serialize(card.render(opts)).should.match('
Testing
Caption
'); + serializer.serialize(card.render(opts)).should.match('
Testing
Caption
'); }); }); diff --git a/core/test/unit/lib/mobiledoc/cards/gallery_spec.js b/core/test/unit/lib/mobiledoc/cards/gallery_spec.js index 798a322523..7dd929fb46 100644 --- a/core/test/unit/lib/mobiledoc/cards/gallery_spec.js +++ b/core/test/unit/lib/mobiledoc/cards/gallery_spec.js @@ -74,7 +74,7 @@ describe('Gallery card', function () { } }; - serializer.serialize(card.render(opts)).should.eql(''); + serializer.serialize(card.render(opts)).should.eql(''); }); it('renders nothing with no images', function () { diff --git a/core/test/unit/lib/mobiledoc/cards/image_spec.js b/core/test/unit/lib/mobiledoc/cards/image_spec.js index 3b9d08ba93..96cf64b0ea 100644 --- a/core/test/unit/lib/mobiledoc/cards/image_spec.js +++ b/core/test/unit/lib/mobiledoc/cards/image_spec.js @@ -14,7 +14,7 @@ describe('Image card', function () { } }; - serializer.serialize(card.render(opts)).should.eql('
'); + serializer.serialize(card.render(opts)).should.eql('
'); }); it('renders an image with caption', function () { @@ -28,7 +28,7 @@ describe('Image card', function () { } }; - serializer.serialize(card.render(opts)).should.eql('
Test caption
'); + serializer.serialize(card.render(opts)).should.eql('
Test caption
'); }); it('renders an image with alt text', function () { @@ -42,7 +42,7 @@ describe('Image card', function () { } }; - serializer.serialize(card.render(opts)).should.eql('
example image
'); + serializer.serialize(card.render(opts)).should.eql('
example image
'); }); it('renders an image with title attribute', function () { @@ -56,7 +56,7 @@ describe('Image card', function () { } }; - serializer.serialize(card.render(opts)).should.eql('
'); + serializer.serialize(card.render(opts)).should.eql('
'); }); it('renders nothing with no src', function () { @@ -85,7 +85,7 @@ describe('Image card', function () { } }; - serializer.serialize(card.render(opts)).should.eql('
'); + serializer.serialize(card.render(opts)).should.eql('
'); }); it('wide', function () { @@ -99,7 +99,7 @@ describe('Image card', function () { } }; - serializer.serialize(card.render(opts)).should.eql('
'); + serializer.serialize(card.render(opts)).should.eql('
'); }); it('full', function () { @@ -113,7 +113,7 @@ describe('Image card', function () { } }; - serializer.serialize(card.render(opts)).should.eql('
'); + serializer.serialize(card.render(opts)).should.eql('
'); }); }); }); diff --git a/core/test/unit/lib/mobiledoc/converters/mobiledoc-converter_spec.js b/core/test/unit/lib/mobiledoc/converters/mobiledoc-converter_spec.js index 7cec7cdfae..130013db61 100644 --- a/core/test/unit/lib/mobiledoc/converters/mobiledoc-converter_spec.js +++ b/core/test/unit/lib/mobiledoc/converters/mobiledoc-converter_spec.js @@ -56,7 +56,7 @@ describe('Mobiledoc converter', function () { ] }; - converter.render(mobiledoc, 2).should.eql('

One
Two

Markdown card

\n

Some markdown

\n

Three


Birdies

Four

HTML card

\n

Some HTML

Embed card

'); + converter.render(mobiledoc, 2).should.eql('

One
Two

Markdown card

\n

Some markdown

\n

Three


Birdies

Four

HTML card

\n

Some HTML

Embed card

'); }); it('removes final blank paragraph', function () {