update lamp

13 files changed, 56 insertions, 91 deletions

diff --git a/2016_lamp_browser/firefox/README.md b/2016_lamp_browser/firefox/README.md
deleted file mode 100644
index 1a34eb0..0000000
--- a/2016_lamp_browser/firefox/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-#lamp
-If you turn off the lamp it will darken your browser!
diff --git a/2016_lamp_browser/firefox/data/onoff.js b/2016_lamp_browser/firefox/data/onoff.js
deleted file mode 100644
index 378a724..0000000
--- a/2016_lamp_browser/firefox/data/onoff.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var on = document.getElementById("on");
-var off = document.getElementById("off");
-
-on.addEventListener('click', function(event) {
-	self.port.emit("lamp", "on");
-}, true);
-
-off.addEventListener('click', function() {
-	self.port.emit("lamp", "off");
-}, true);
-
diff --git a/2016_lamp_browser/firefox/data/icon-16.png b/2016_lamp_browser/firefox/icon-16.png
index 698e8bf..698e8bf 100644
--- a/2016_lamp_browser/firefox/data/icon-16.png
+++ b/2016_lamp_browser/firefox/icon-16.png
diff --git a/2016_lamp_browser/firefox/data/icon-32.png b/2016_lamp_browser/firefox/icon-32.png
index a629ac6..a629ac6 100644
--- a/2016_lamp_browser/firefox/data/icon-32.png
+++ b/2016_lamp_browser/firefox/icon-32.png
diff --git a/2016_lamp_browser/firefox/data/icon-64.png b/2016_lamp_browser/firefox/icon-64.png
index 80130ab..80130ab 100644
--- a/2016_lamp_browser/firefox/data/icon-64.png
+++ b/2016_lamp_browser/firefox/icon-64.png
diff --git a/2016_lamp_browser/firefox/data/icon.png b/2016_lamp_browser/firefox/icon.png
index 21fd4ae..21fd4ae 100644
--- a/2016_lamp_browser/firefox/data/icon.png
+++ b/2016_lamp_browser/firefox/icon.png
diff --git a/2016_lamp_browser/firefox/index.js b/2016_lamp_browser/firefox/index.js
deleted file mode 100644
index c83160e..0000000
--- a/2016_lamp_browser/firefox/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-var { ToggleButton } = require('sdk/ui/button/toggle');
-var panels = require("sdk/panel");
-var self = require("sdk/self").data;
-var pageMod = require("sdk/page-mod");
-var state = false;
-
-var button = ToggleButton({
-	id: "my-button",
-	label: "lamp",
-	icon: {
-		"16": "./icon-16.png",
-		"32": "./icon-32.png",
-		"64": "./icon-64.png"
-	},
-	onChange: handleChange
-});
-
-var panel = panels.Panel({
-	width: 500,
-	height: 130,
-	contentURL: self.url("panel.html"),
-	contentScriptFile: self.url("onoff.js"),
-	onHide: handleHide
-});
-
-function handleChange(state) {
-	if (state.checked) {
-		panel.show({
-			position: button
-		});
-	}
-}
-
-function handleHide() {
-	button.state('window', {checked: false});
-}
-
-var workers = [];
-panel.port.on("lamp", function (text) {
-	if(text == "on"){
-		state = true;
-		pageMod.PageMod({
-			include: "*",
-			attachTo: ["existing", "top"],
-			contentScript: 'document.getElementsByTagName("body")[0].style = "transition: opacity 0.2s ease-in; opacity: 1"'
-		});
-	} else if (text == "off"){
-		state == false;
-		pageMod.PageMod({
-			include: "*",
-			attachTo: ["existing", "top"],
-			contentScript: 'document.getElementsByTagName("body")[0].style = "transition: opacity 0.2s ease-in; opacity: 0.0"'
-		});
-	}
-});
diff --git a/2016_lamp_browser/firefox/lamp.css b/2016_lamp_browser/firefox/lamp.css
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/2016_lamp_browser/firefox/lamp.css
diff --git a/2016_lamp_browser/firefox/lamp.js b/2016_lamp_browser/firefox/lamp.js
new file mode 100644
index 0000000..6f2dbc5
--- /dev/null
+++ b/2016_lamp_browser/firefox/lamp.js
@@ -0,0 +1,23 @@
+document.addEventListener('DOMContentLoaded', init);
+var first = false;
+
+function init(){
+    var elem = document.getElementById('on');
+    elem.addEventListener('click',funcon);
+	var elem2 = document.getElementById('off');
+    elem2.addEventListener('click',funcoff); 
+}
+
+function funcon(){
+    chrome.tabs.executeScript({
+		code: "document.body.style.opacity = '1.0'"
+	});
+}
+
+function funcoff(){
+	chrome.tabs.executeScript({
+		code: "document.body.style.MozTransition = 'opacity 1s ease-in'; document.body.style.opacity = '0.0'"
+	});
+}
+
+
diff --git a/2016_lamp_browser/firefox/lamp.xpi b/2016_lamp_browser/firefox/lamp.xpi
deleted file mode 100644
index 0468d7a..0000000
--- a/2016_lamp_browser/firefox/lamp.xpi
+++ /dev/null
diff --git a/2016_lamp_browser/firefox/manifest.json b/2016_lamp_browser/firefox/manifest.json
new file mode 100644
index 0000000..8d26e31
--- /dev/null
+++ b/2016_lamp_browser/firefox/manifest.json
@@ -0,0 +1,19 @@
+{
+	"manifest_version": 2,
+
+	"name": "Lamp",
+	"description": "If you turn off this lamp it will darken your browser!",
+	"version": "1.0",
+	 "author": "joak",
+	"permissions": ["activeTab"],
+	"browser_action": {
+		"default_icon": "icon.png",
+		"default_popup": "popup.html",
+		"default_title": "Turns off the light!"
+	},
+	"icons": { 
+		"16": "icon-16.png",
+		"32": "icon-32.png",
+		"64": "icon-64.png"
+	}
+}
diff --git a/2016_lamp_browser/firefox/package.json b/2016_lamp_browser/firefox/package.json
deleted file mode 100644
index cd27a59..0000000
--- a/2016_lamp_browser/firefox/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "title": "lamp",
-  "name": "lamp",
-  "version": "0.0.1",
-  "icon": "resource://lamp/data/icon-32.png", 
-  "homepage": "http://joak.nospace.at",
-  "description": "If you turn off this lamp it will darken your browser!",
-  "main": "index.js",
-  "author": "joak",
-  "engines": {
-    "firefox": ">=38.0a1"
-  },
-  "license": "GPL",
-  "keywords": [
-    "jetpack"
-  ]
-}
diff --git a/2016_lamp_browser/firefox/data/panel.html b/2016_lamp_browser/firefox/popup.html
index 1f3c13d..59358f8 100644
--- a/2016_lamp_browser/firefox/data/panel.html
+++ b/2016_lamp_browser/firefox/popup.html
@@ -1,9 +1,14 @@
-<head>
-	<style>
+<!doctype html>
+<html>
+  <head>
+    <title>Lamp</title>
+    <style>
 	body {
 		font-family: "Segoe UI", "Lucida Grande", Tahoma, sans-serif;
         font-size: 100%;
         background: white;
+        width: 400px;
+        height: 115px;
 	}
 	#button {
 		text-align: center;
@@ -27,9 +32,10 @@
 	#settings{
 		text-align: center;
 	}
-	</style>
-</head>
-<body>
+    </style>
+    <script src="lamp.js"></script>
+  </head>
+  <body>
 	<div id="wrapper">
 		<div id="title">
 			<h2>Lamp</h2>
@@ -41,4 +47,6 @@
 			</div>
 		</div>
 	</div>
-</body>
+  </body>
+</html>
+