Implemented Reset...

Author: keyvanp

CHANGELOG.txt

@@ -1,5 +1,10 @@
 CHANGELOG
 
+v2.0a 16.01.08 build 001 (with Electron)
++ Improve code efficiency.
++ Moved Prompt It! styling to css.
++ Implemented Reset...
+
 v2.0a 16.01.03 build 014 (with Electron)
 + Performance improvements and asynchronious bug fixes by making use of requestAnimationFrame().
 + Implemented basic pointer based drag and drop in teleprompter.html.

css/editor.css

@@ -37,6 +37,7 @@ body {
 #promptIt {
 	font-size: 1.4em;
 	background:#EEE;
+	font-weight: bold;
 }
 
 #editorcontainer {

index.html

@@ -57,7 +57,7 @@
 					<a href="http://imaginary.tech/teleprompter" target="_blank" class="navbar-brand"><img src="img/logo.png" alt="Teleprompter" style="height:20px;"></a>
 				</div>
 				<ul class="nav navbar-nav navbar-right">
-					<li><a id="promptIt" href=" "><strong>Prompt It!</strong></a></li>
+					<li><a id="promptIt" href=" ">Prompt It!</a></li>
 				</ul>
 			</div>
 		</header>
@@ -80,8 +80,8 @@
 						<!--<label for="basic-url">Flip mode</label>-->
 						<label for="basic-url">Secondary display</label>
 						<select class="form-control" id="secondary" name="secondary">
-							<option value="0" >Disabled</option>
-							<option value="1" selected="selected">Normal (Don't Flip)</option>
+							<option value="0" selected="selected">Disabled</option>
+							<option value="1" >Normal (Don't Flip)</option>
 							<option value="2">Horizontal Flip</option>
 							<option value="3">Vertical Flip</option>
 							<option value="4">Double Flip</option>
@@ -158,7 +158,7 @@ <h4>How to use anchors:</h4>
 
 			<p>Code licensed under <a rel="license" href="LICENSE" target="_blank">GPL3</a>, assets under <a class="external" rel="license" href="https://creativecommons.org/licenses/by/4.0/" target="_blank">CC BY 4.0</a>.</p>
 			<ul class="bs-docs-footer-links">
-				<li>Currently v2.0a build 013 (16.01.02)</li>
+				<li>Currently v2.0a build 001 (16.01.08)</li>
 				<li>&middot;</li>
 				<li><a class="external" target="_blank" href="https://github.com/imaginaryfilms/Teleprompter.git">Source</a></li>
 				<li>&middot;</li>

js/editor.js

@@ -31,7 +31,7 @@ var debug;
 
 		// Set DOM javascript controls
 		document.getElementById("prompterStyle").setAttribute("onclick","setStyleEvent(value);");
-		document.getElementById("promptIt").setAttribute("onclick","submitTeleprompter(); return false;");
+		document.getElementById("promptIt").onclick = submitTeleprompter;
 
 		// Set default style
 		setStyle();
@@ -124,17 +124,20 @@ var debug;
 		console.log("Save pressed");
 	}
 
-	// Initialize objects after DOM is loaded
-	if (document.readyState === "interactive" || document.readyState === "complete")
-		// Call init if the DOM (interactive) or document (complete) is ready.
-		init();
-	else
-		// Set init as a listener for the DOMContentLoaded event.
-		document.addEventListener("DOMContentLoaded", init);
-
-}());
-
-// DOM Level functions, allow UI click interaction
+	function resetTeleprompter(event) {
+		// Stops the event but continues executing he code.
+	    event.preventDefault();
+		// INFO: event.target === document.getElementById("promptIt") and more efficient.
+	    event.target.textContent = "Prompt It!";
+		event.target.onclick = submitTeleprompter;
+		document.getElementById("content").style.display = "";
+		document.getElementById("editorcontainer").style.display = "";
+		document.getElementById("footer").style.display = "";
+		// Hide prompter frame
+		document.getElementById("framecontainer").style.display = "none";
+	}
+	
+	// DOM Level functions, allow UI click interaction
 // On change Prompter Style
 function setStyleEvent(prompterStyle) {
 	if (setStyle) {
@@ -152,7 +155,9 @@ function setStyleEvent(prompterStyle) {
 }
 
 // On "Prompt It!" clicked
-function submitTeleprompter() {
+function submitTeleprompter(event) {
+	// Stops the event but continues executing the code.
+	event.preventDefault();
 	// Get html from editor
 	var htmldata = tinymce.get("prompt").getContent();
 
@@ -173,7 +178,9 @@ function submitTeleprompter() {
 		document.getElementById("framecontainer").style.display = "block";
 		// Load teleprompter
 		document.getElementById("teleprompterframe").src = "teleprompter.html?debug=1";
-		document.getElementById("promptIt").innerHTML = "<strong>Reset...</strong>";
+		// INFO: event.target === document.getElementById("promptIt") and more efficient.
+		event.target.textContent = "Reset...";
+		event.target.onclick = resetTeleprompter;
 	}
 
 	// "Secondary"
@@ -197,3 +204,13 @@ function submitTeleprompter() {
 	}
 	*/
 }
+	
+	// Initialize objects after DOM is loaded
+	if (document.readyState === "interactive" || document.readyState === "complete")
+		// Call init if the DOM (interactive) or document (complete) is ready.
+		init();
+	else
+		// Set init as a listener for the DOMContentLoaded event.
+		document.addEventListener("DOMContentLoaded", init);
+
+}());

package.json

@@ -1,6 +1,7 @@
 {
+	"_comment": "0061 = a (Alpha), 0062 = b (Beta), 0072 = r (Release)",
 	"name": "Teleprompter",
-	"version": "2.0a 16.01.03 build 014",
+	"version": "2.0.0061.16.01.08.001",
 	"description": "The most complete and professional free software teleprompter app on the web.",
 	"main": "main.js",
 	"scripts": {
@@ -10,4 +11,4 @@
 	"devDependencies": {
 		"electron-prebuilt": "^0.36.0"
 	}
-}
+}