From 641faa4df31d3d135e14c1dbb75205ab81847127 Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Mon, 21 Oct 2013 15:51:05 +0200 Subject: [PATCH 1/8] App support for firefox --- index.html | 16 +++++++++++++++- js/websockets.js | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 08e7ff8..97841c7 100644 --- a/index.html +++ b/index.html @@ -120,7 +120,21 @@ /relay sslcertkey /relay add ssl.weechat 8000 - + + + +
+
+

+ + Install app + +

+
+
+
+

If you have a very new Firefox you can install the frontend as an app. Click the button to install.

+
diff --git a/js/websockets.js b/js/websockets.js index 187fbfd..a84cda9 100644 --- a/js/websockets.js +++ b/js/websockets.js @@ -336,6 +336,20 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', window.webkitNotifications.requestPermission(); } } + // Check for firefox & app installed + if(navigator.mozApps != undefined) { + navigator.mozApps.getSelf().onsuccess = function _onAppReady(evt) { + var app = evt.target.result; + if(app) { + $scope.isinstalled = true; + }else { + $scope.isinstalled = false; + } + console.log($scope.isinstalled); + } + }else { + $scope.isinstalled = false; + } $rootScope.$on('activeBufferChanged', function() { $rootScope.scrollToBottom(); @@ -432,6 +446,26 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', $scope.disconnect = function() { connection.disconnect(); } + $scope.install = function() { + if(navigator.mozApps != undefined) { + var request = navigator.mozApps.install('http://torhve.github.io/glowing-bear/manifest.webapp'); + request.onsuccess = function () { + $scope.isinstalled = true; + // Save the App object that is returned + var appRecord = this.result; + // Start the app. + appRecord.launch(); + alert('Installation successful!'); + }; + request.onerror = function () { + // Display the error information from the DOMError object + alert('Install failed, error: ' + this.error.name); + }; + }else{ + alert('Sorry. Only supported in Firefox v26+'); + } + } + /* Function gets called from bufferLineAdded code if user should be notified */ $rootScope.createHighlight = function(buffer, message) { From 9e88f7775e9375155b0d17a918ccc365e9ef6eb1 Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Mon, 21 Oct 2013 15:51:55 +0200 Subject: [PATCH 2/8] Add firefox app manifest --- manifest.webapp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 manifest.webapp diff --git a/manifest.webapp b/manifest.webapp new file mode 100644 index 0000000..3e6db2b --- /dev/null +++ b/manifest.webapp @@ -0,0 +1,16 @@ +{ + "name": "WeeChat", + "description": "WeeChat Web frontend", + "icons": { + "128": "/glowing-bear/img/favicon.png" + }, + "installs_allowed_from": [ + "*" + ], + "developer": { + "name": "Tor Hveem", + "url": "http://github.com/torhve/" + }, + "default_locale": "en" +} + From 5cd2fa19faf4ce7116e73fe50f603b927e308f5e Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Mon, 21 Oct 2013 16:12:58 +0200 Subject: [PATCH 3/8] Add chrome app manifest. To test, check: http://developer.chrome.com/apps/first_app.html --- manifest.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 manifest.json diff --git a/manifest.json b/manifest.json new file mode 100644 index 0000000..5a8e96b --- /dev/null +++ b/manifest.json @@ -0,0 +1,25 @@ +{ + "name": "Weechat", + "description": "WeeChat Web frontend", + "version": "0.0.0.1", + "manifest_version": 2, + "icons": { + "32": "img/favicon.png", + "128": "img/weechat_logo_128x128.png" + }, + "app": { + "urls": [ + "http://torhve.github.io/glowing-bear/" + ], + "launch": { + "web_url": "http://torhve.github.io/glowing-bear/" + } + }, + "permissions": [ + "notifications" + ], + "web_accessible_resources": [ + "img/favicon.png" + ], +} +} From f07981cdefd3cc27f32e4bbc3925effc6ce29b9b Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Mon, 21 Oct 2013 16:15:46 +0200 Subject: [PATCH 4/8] Add 128x128 icon --- img/weechat_logo_128x128.png | Bin 0 -> 9970 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 img/weechat_logo_128x128.png diff --git a/img/weechat_logo_128x128.png b/img/weechat_logo_128x128.png new file mode 100644 index 0000000000000000000000000000000000000000..83acdc3c7bb919a88c0784bfc64908ea2e8738a1 GIT binary patch literal 9970 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 Date: Mon, 21 Oct 2013 16:18:16 +0200 Subject: [PATCH 5/8] Fix version, path and icon --- manifest.webapp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manifest.webapp b/manifest.webapp index 3e6db2b..8ef9ff5 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -2,8 +2,9 @@ "name": "WeeChat", "description": "WeeChat Web frontend", "icons": { - "128": "/glowing-bear/img/favicon.png" + "128": "/glowing-bear/img/weechat_logo_128x128.png" }, + "launch_path": "/glowing-bear/", "installs_allowed_from": [ "*" ], @@ -11,6 +12,7 @@ "name": "Tor Hveem", "url": "http://github.com/torhve/" }, - "default_locale": "en" + "default_locale": "en", + "version": "2" } From 29e767e989af3a06fa2acf63d0ed326312570c53 Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Mon, 21 Oct 2013 16:23:42 +0200 Subject: [PATCH 6/8] Add icon size --- manifest.webapp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.webapp b/manifest.webapp index 8ef9ff5..e9c20fa 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -2,7 +2,8 @@ "name": "WeeChat", "description": "WeeChat Web frontend", "icons": { - "128": "/glowing-bear/img/weechat_logo_128x128.png" + "128": "img/weechat_logo_128x128.png", + "32": "img/favicon.png" }, "launch_path": "/glowing-bear/", "installs_allowed_from": [ From e974dde95c960a5d81acd129febbd3906bb967a0 Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Tue, 22 Oct 2013 13:26:35 +0200 Subject: [PATCH 7/8] Fix markup error --- index.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 97841c7..e7f5e38 100644 --- a/index.html +++ b/index.html @@ -33,7 +33,7 @@ Oh no! We cannot connect! From abed2b753fcf82f7979ddceeef5560230a52966b Mon Sep 17 00:00:00 2001 From: Tor Hveem Date: Tue, 22 Oct 2013 13:35:55 +0200 Subject: [PATCH 8/8] Make the white border on the panels pretty --- css/glowingbear.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/css/glowingbear.css b/css/glowingbear.css index f468ccd..09c3d97 100644 --- a/css/glowingbear.css +++ b/css/glowingbear.css @@ -36,6 +36,12 @@ body { box-shadow: rgba(255, 255, 255, 0.07) -1px 0 0; border-left: 1px solid #121212; } +.panel-group .panel-heading + .panel-collapse .panel-body { +-webkit-box-shadow: rgba(255, 255, 255, 0.07) 0 -1px 0; + -moz-box-shadow: rgba(255, 255, 255, 0.07) 0 -1px 0; + box-shadow: rgba(255, 255, 255, 0.07) 0 -1px 0; + border-top: 1px solid #121212; +} input#sendMessage { border: 0;