extract Link to internal arc plugin

devrieda · Oct 15, 2015 · 77aa7c9 · 77aa7c9
1 parent 6ba0653
commit 77aa7c9
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 20 deletions.
diff --git a/examples/basic/Config.js b/examples/basic/Config.js
@@ -14,6 +14,7 @@ const Config = {
       { name: "center" },
       { name: "quote" },
       { name: "code" },
+      { name: "link" },
       // { name: "tweet", src: TweetPlugin }
     ];
   },

diff --git a/modules/helpers/Config/MenuButtonConfig.js b/modules/helpers/Config/MenuButtonConfig.js
@@ -1,11 +1,6 @@
 import Config from './Config';
 
-// default buttons
-import LinkButton from '../../components/MenuButtons/LinkButton';
-
-const defaults = [
-  LinkButton,
-];
+const defaults = [];
 
 const MenuButtonConfig = Config({
   getInitialItems() {

diff --git a/modules/helpers/Config/__test__/MenuButtonConfig-test.js b/modules/helpers/Config/__test__/MenuButtonConfig-test.js
@@ -6,13 +6,13 @@ import ItalicKey from '../../../plugins/italic/ItalicKey';
 describe('MenuButtonConfig', () => {
   beforeEach(function() {
     MenuButtonConfig.reset();
-    MenuButtonConfig.use(ItalicKey, { before: 'link' })
+    MenuButtonConfig.use(ItalicKey)
     MenuButtonConfig.use(BoldKey, { before: 'italic' })
   });
 
   describe("#getItems", () => {
     it("retrieves list of default items", () => {
-      expect(MenuButtonConfig.getItems().length).toEqual(3);
+      expect(MenuButtonConfig.getItems().length).toEqual(2);
     });
   });
 

diff --git a/modules/helpers/ConfigManager.js b/modules/helpers/ConfigManager.js
@@ -12,6 +12,7 @@ import H2Plugin from '../plugins/h2';
 import H3Plugin from '../plugins/h3';
 import CenterPlugin from '../plugins/center';
 import QuotePlugin from '../plugins/quote';
+import LinkPlugin from '../plugins/link';
 import CodePlugin from '../plugins/code';
 
 const DEFAULT_PLUGINS = [
@@ -22,6 +23,7 @@ const DEFAULT_PLUGINS = [
   { name: 'h3', src: H3Plugin },
   { name: 'center', src: CenterPlugin },
   { name: 'quote', src: QuotePlugin },
+  { name: 'link', src: LinkPlugin },
   { name: 'code', src: CodePlugin },
 ];
 

diff --git a/modules/plugins/link/Link.scss b/modules/plugins/link/Link.scss
@@ -0,0 +1,5 @@
+// inline
+.arc-Editor-Block__a,
+.arc-Editor-Block__a:visited {
+  color: rgba(0,153,224,1.0);
+}
diff --git a/modules/components/MenuButtons/LinkButton.js → modules/plugins/link/LinkButton.js b/modules/components/MenuButtons/LinkButton.js → modules/plugins/link/LinkButton.js
@@ -1,5 +1,5 @@
-import React from 'react/addons';
-import MenuButton from '../MenuButton';
+import React from 'react';
+import MenuButton from '../../components/MenuButton';
 import ToggleMarkup from '../../helpers/Manipulation/ToggleMarkup';
 import EditorStore from '../../stores/EditorStore';
 

diff --git a/.../MenuButtons/__tests__/LinkButton-test.js → ...plugins/link/__tests__/LinkButton-test.js b/.../MenuButtons/__tests__/LinkButton-test.js → ...plugins/link/__tests__/LinkButton-test.js
diff --git a/modules/plugins/link/index.js b/modules/plugins/link/index.js
@@ -0,0 +1,10 @@
+import Button from "./LinkButton";
+import './Link.scss';
+
+const Plugin = {
+  installMenuButtons(config) {
+    config.use(Button);
+  },
+};
+
+export default Plugin;
diff --git a/modules/stylesheets/components/Block.scss b/modules/stylesheets/components/Block.scss
@@ -65,12 +65,3 @@
   counter-increment: post;
   content: counter(post) ".";
 }
-
-// inline
-.arc-Editor-Block__em {
-  font-style: italic;
-}
-.arc-Editor-Block__a,
-.arc-Editor-Block__a:visited {
-  color: $link-color;
-}
diff --git a/modules/stylesheets/shared/_variables.scss b/modules/stylesheets/shared/_variables.scss
@@ -6,7 +6,6 @@ $text-color: rgba(0,0,0,0.8);
 $light-text-color: rgba(0,0,0,0.5);
 $header-color: rgba(0,0,0,0.8);
 $rule-color: rgba(0,0,0,0.15);
-$link-color: rgba(0,153,224,1.0);
 
 // menu
 $menu-color: rgba(0, 151, 226, 1);