Merge pull request #904 from callahad/remove-fxos

Remove obsolete references to Firefox OS / mozApps

README.md

@@ -17,14 +17,12 @@ Now point your browser to the [Glowing Bear](http://www.glowing-bear.org)! If yo
 You can run Glowing Bear in many ways:
 
  * like any other webpage
- * as an app in Firefox (choose "Install app" on the landing page)
  * Chrome app ("Tools", then "Create application shortcuts")
  * Android Chrome app a full-screen experience ("Add to homescreen").
  * [Android app](https://play.google.com/store/apps/details?id=com.glowing_bear) that you can install from the Google Play Store
- * [Firefox OS app](https://marketplace.firefox.com/app/glowing-bear/) in the Firefox Marketplace.
  * Electron app, for Windows, Linux and MacOSX. ```npm install; npm install electron-packager; npm run build-electron-{windows, darwin, linux}```
 
-<a href="https://play.google.com/store/apps/details?id=com.glowing_bear"><img alt="Android app on Google Play" src="/assets/img/badge_playstore.png" /></a><a href="https://marketplace.firefox.com/app/glowing-bear/"><img alt="Firefox OS app in the Firefox Marketplace" src="/assets/img/badge_firefoxos.png" /></a>
+<a href="https://play.google.com/store/apps/details?id=com.glowing_bear"><img alt="Android app on Google Play" src="/assets/img/badge_playstore.png" /></a>
 
 ##Screenshots
 

index.html

@@ -191,7 +191,7 @@ chown -R <strong>username</strong>:<strong>username</strong> ~<strong>username</
             </div>
           </div>
         </div>
-        <div class="panel" data-state="collapsed" ng-hide="isinstalled">
+        <div class="panel" data-state="collapsed">
           <div class="panel-heading">
             <h4 class="panel-title">
               <a class="accordion-toggle" ng-click="toggleAccordion($event)">

js/glowingbear.js

@@ -53,22 +53,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         $log.debug($rootScope.$$watchersCount);
     };
 
-    $scope.isinstalled = (function() {
-        // Check for firefox & app installed
-        if (navigator.mozApps !== undefined) {
-            navigator.mozApps.getSelf().onsuccess = function _onAppReady(evt) {
-                var app = evt.target.result;
-                if (app) {
-                    return true;
-                } else {
-                    return false;
-                }
-            };
-        } else {
-            return false;
-        }
-    }());
-
 
     // Detect page visibility attributes
     (function() {
@@ -617,30 +601,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         connection.attemptReconnect(bufferId, 3000);
     };
 
-//XXX this is a bit out of place here, either move up to the rest of the firefox install code or remove
-    $scope.install = function() {
-        if (navigator.mozApps !== undefined) {
-            // Find absolute url with trailing '/' or '/index.html' removed
-            var base_url = location.protocol + '//' + location.host +
-                location.pathname.replace(/\/(index\.html)?$/, '');
-            var request = navigator.mozApps.install(base_url + '/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+');
-        }
-    };
-
     $scope.showModal = function(elementId) {
         document.getElementById(elementId).setAttribute('data-state', 'visible');
     };