Merge pull request #124 from WordPress/update/tinymce-single-nav

Use common navigation for single TinyMCE instance prototype
WordPress · Feb 23, 2017 · fec4752 · fec4752
2 parents e28bc02 + 766c69f
commit fec4752
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 27 deletions.
diff --git a/index.html b/index.html
@@ -87,6 +87,6 @@ <h2>1.0 Is The Loneliest Number</h2>
 			</div>
 		</div>
 		<script src="blocks.js"></script>
-		<script src="navigation.js"></script>
+		<script src="shared/navigation.js"></script>
 	</body>
 </html>
diff --git a/shared/index.css b/shared/index.css
@@ -7,22 +7,6 @@ body {
 	margin: 1em;
 }
 
-a {
-	color: inherit;
-}
-
-nav {
-	font-size: 16px;
-}
-
-nav:target {
-	display: none;
-}
-
-nav li.is-active {
-	font-weight: bold;
-}
-
 #editor {
 	background: #fff;
 	margin: 5em auto;
@@ -31,6 +15,10 @@ nav li.is-active {
 	width: 37.5em;
 }
 
+#editor a {
+	color: inherit;
+}
+
 #editor iframe {
 	max-width: 100%;
 	border: 0;

diff --git a/navigation.js → shared/navigation.js b/navigation.js → shared/navigation.js
@@ -8,7 +8,8 @@
 	 */
 	PROTOTYPES = {
 		'/': 'UI Prototype',
-		'/tinymce-per-block/': 'TinyMCE per block prototype'
+		'/tinymce-per-block/': 'TinyMCE per block prototype',
+		'/tinymce-single/': 'Single TinyMCE instance prototype'
 	};
 
 	// Generate Navigation DOM

diff --git a/tinymce-per-block/index.html b/tinymce-per-block/index.html
@@ -15,6 +15,6 @@
 	<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Merriweather:300,300i,400,400i,700,700i">
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.5.3/tinymce.min.js"></script>
 	<script src="build/app.js"></script>
-	<script src="../navigation.js"></script>
+	<script src="../shared/navigation.js"></script>
 </body>
 </html>
diff --git a/tinymce-single/index.html b/tinymce-single/index.html
@@ -7,14 +7,6 @@
 		<link rel="stylesheet" type="text/css" href="../shared/index.css">
 	</head>
 	<body>
-		<!-- Target to hide: #user-test -->
-		<nav id="user-test">
-			<ol>
-				<li><a href="../">Main UI prototype</a></li>
-				<li><a href="../tinymce-per-block/">TinyMCE Instance per Block</a></li>
-				<li class="is-active">Single TinyMCE Instance</li>
-			</ol>
-		</nav>
 		<div id="editor">
 			<h1>1.0 Is The Loneliest Number</h1>
 
@@ -27,6 +19,7 @@ <h1>1.0 Is The Loneliest Number</h1>
 			<p>I like Apple for the opposite reason: they’re not afraid of getting a rudimentary 1.0 out into the world.</p>
 		</div>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.5.3/tinymce.min.js"></script>
+		<script src="../shared/navigation.js"></script>
 		<script src="../shared/tinymce/clean-paste.js"></script>
 		<script src="../shared/tinymce/toolbar.js"></script>
 		<script src="../shared/tinymce/wplink.js"></script>