toolbar button behavior back to previous one

src/allplatforms/classes/SuperGlue.js

@@ -112,11 +112,18 @@ SC.loadPackage({ 'SuperGlue': {
                         '************************************************',
                         '   SuperGlue editor has successfully started!',
                         '',
-                        '   To access the running system for live',
-                        '   development, enter',
+                        '   To access the running system\'s code',
+                        '   open the bystem browser, just enter',
                         '   > SC.do(\'SCSystemBrowser\', \'open\')',
                         '************************************************'
-                    ].join('\n'))
+                    ].join('\n'));
+
+
+                    // Flash the outlines
+                    SuperGlue.get('document').set({ showOutlines: true });
+                    window.setTimeout(function(){
+                        SuperGlue.get('document').set({ showOutlines: false });
+                    }, 700);
 
                     
                 } catch(error) {

src/allplatforms/injections/notSGpage.js

@@ -0,0 +1,6 @@
+/*
+* I am injected by the browser add-on to signal to the user that the page is not a Superglue page
+*
+*/
+
+alert('This site was not made with SuperGlue.\n\nNavigate to the adress of your Superglue server to get started.')

src/chromium/background.js

@@ -1,7 +1,4 @@
 
-var powerSwitch = false;
-
-
 
 chrome.runtime.onMessage.addListener(
     function(request, sender, sendResponse) {
@@ -45,19 +42,6 @@ chrome.runtime.onMessage.addListener(
 
 chrome.browserAction.onClicked.addListener(function(tab){
 
-    powerSwitch = !powerSwitch;
-
-    chrome.tabs.query({} ,function(tabs){
-        for (var i = 0; i < tabs.length; i++) {
-            chrome.tabs.executeScript(tabs[i].id, { file: 'content_probeForSG.js' });
-        }
-    });
-
-    chrome.browserAction.setIcon({ path: 
-        {
-            '19': 'icon-19' + (powerSwitch ? '-powerOn' : '-powerOff') + '.png',
-            '38': 'icon-38' + (powerSwitch ? '-powerOn' : '-powerOff') + '.png'
-        }
-    });
+    chrome.tabs.executeScript(null, { file: 'content_probeForSG.js' });
 
 });

src/chromium/content_probeForSG.js

@@ -148,8 +148,6 @@
     var activateSuperGlue = function(){
 
 
-
-
         var clipboardCss = document.createElement("link");
         clipboardCss.setAttribute("data-superglue", "editing-interface");
         clipboardCss.setAttribute("rel", "stylesheet");
@@ -216,36 +214,41 @@
         script.setAttribute("src", chrome.extension.getURL("superglue-client/injections/init.js") );
         document.head.appendChild(script);
 
-    };
-
-
     
 
-    
+    };
 
-    chrome.runtime.sendMessage({ contentProbeForSG: "isPowerOn?" }, function(response) {
 
-        if(response.powerOn){
+    var notSGpage = function(){
 
-            // check if page is superglue page
-            if(     document.querySelectorAll('meta[name=generator]').length > 0 
-                &&  document.querySelector('meta[name=generator]').getAttribute('content') === 'SuperGlue'){
+        var script = document.createElement("script");
+        script.setAttribute("data-superglue", "editing-interface");
+        script.setAttribute("type", "text/javascript");
+        script.async = false;
+        script.setAttribute("src", chrome.extension.getURL("superglue-client/injections/notSGpage.js") );
+        document.head.appendChild(script);
+        document.head.removeChild(script);
 
-                // check if editing is active
-                if(     document.querySelectorAll('meta[name=superglue-mode]').length === 0
-                    ||  document.querySelector('meta[name=superglue-mode]').getAttribute('content') !== 'editing'){
+    };
 
-                    activateSuperGlue();
 
-                }
+    // check if page is superglue page
+    if(     document.querySelectorAll('meta[name=generator]').length > 0 
+        &&  document.querySelector('meta[name=generator]').getAttribute('content') === 'SuperGlue'){
+
+        // check if editing is active
+        if(     document.querySelectorAll('meta[name=superglue-mode]').length === 0
+            ||  document.querySelector('meta[name=superglue-mode]').getAttribute('content') !== 'editing'){
 
-            } 
+            activateSuperGlue();
 
         }
 
+    } else { // page is not a superglue page
 
+        notSGpage();
 
-    });
+    }
 
 
     

src/chromium/manifest.json

@@ -20,8 +20,8 @@
 
     "browser_action": {
         "default_icon": {
-            "19": "icon-19-powerOff.png",
-            "38": "icon-38-powerOff.png"
+            "19": "icon-19.png",
+            "38": "icon-38.png"
         },
         "default_title": "SuperGlue"
     },
@@ -29,14 +29,7 @@
     "background": {
         "scripts":      [ "background.js" ],
         "persistent":   true
-    },
-
-    "content_scripts": [
-        {
-          "matches":    [ "<all_urls>" ],
-          "js":         ["content_probeForSG.js"]
-        }
-    ]
+    }
 
     
 

src/firefox/data/content_probeForSG.js

@@ -205,42 +205,42 @@
         script.setAttribute("src", self.options.dataPath + "injections/init.js" );
         document.head.appendChild(script);
 
+
     };
 
 
-    
+    var notSGpage = function(){
 
-    self.port.on('SuperGlue', function(message) {
-        
+        var script = document.createElement("script");
+        script.setAttribute("data-superglue", "editing-interface");
+        script.setAttribute("type", "text/javascript");
+        script.async = false;
+        script.setAttribute("src", self.options.dataPath + "injections/notSGpage.js" );
+        document.head.appendChild(script);
+        document.head.removeChild(script);
 
-        if(message.powerOn){
+    };
 
-            // check if page is superglue page
-            if(     document.querySelectorAll('meta[name=generator]').length > 0 
-                &&  document.querySelector('meta[name=generator]').getAttribute('content') === 'SuperGlue'){
 
-                // check if editing is active
-                if(     document.querySelectorAll('meta[name=superglue-mode]').length === 0
-                    ||  document.querySelector('meta[name=superglue-mode]').getAttribute('content') !== 'editing'){
 
-                    activateSuperGlue();
+    // check if page is superglue page
+    if(     document.querySelectorAll('meta[name=generator]').length > 0 
+        &&  document.querySelector('meta[name=generator]').getAttribute('content') === 'SuperGlue'){
 
-                }
+        // check if editing is active
+        if(     document.querySelectorAll('meta[name=superglue-mode]').length === 0
+            ||  document.querySelector('meta[name=superglue-mode]').getAttribute('content') !== 'editing'){
 
-            } 
+            activateSuperGlue();
 
         }
 
+    } else { // page is not a superglue page
 
-    });
-    
-    self.port.on('SuperGlueState', function(message){
-        if(message.contentProbeForSG === 'updateStatusOfSG'){
-            self.port.emit('SuperGlue', { contentProbeForSG: 'isPowerOn?' });
-        }
-    })
+        notSGpage();
+
+    }
 
-    self.port.emit('SuperGlue', { contentProbeForSG: 'isPowerOn?' });
 
 
 

src/firefox/lib/main.js

@@ -4,20 +4,8 @@ var buttons     = require('sdk/ui/button/action'),
     self        = require('sdk/self'),
     pageMod     = require('sdk/page-mod'),
     clipboard   = require('sdk/clipboard'),
-    iconsOn     =   {
-                        '16': './icon-16-powerOn.png',
-                        '32': './icon-32-powerOn.png',
-                        '64': './icon-64-powerOn.png'
-                    },
-    iconsOff    =   {
-                        '16': './icon-16-powerOff.png',
-                        '32': './icon-32-powerOff.png',
-                        '64': './icon-64-powerOff.png'
-                    },
-
-    workers     = [],
 
-    powerSwitch = false;
+    workers     = [];
 
 
 function detachWorker(worker, workerArray) {
@@ -27,59 +15,52 @@ function detachWorker(worker, workerArray) {
     }
 }
 
-pageMod.PageMod({
-    include:                [ '*', 'file://*' ],
-    contentScriptFile:      self.data.url('content_probeForSG.js'),
-    contentScriptOptions:   {'dataPath' : self.data.url('superglue-client') + '/'},
-    onAttach: function(worker){
 
-        workers.push(worker);
 
-        worker.port.on('SuperGlue', function(request) {
-            if(request.contentProbeForSG === 'isPowerOn?'){
-                worker.port.emit('SuperGlue', { powerOn: powerSwitch })
-            }
-        });
 
-        worker.port.on('SuperGlueClipboard', function(message){
-
-            if(message.action === 'copy'){
-                clipboard.set(message.value);
-            }
+var button = buttons.ActionButton({
 
-            if(message.action === 'paste'){
-                worker.port.emit('SuperGlueClipboard', {
-                    action: 'pasteResponse',
-                    value:  clipboard.get()
-                })
-            }
+        id:         'superglue-button',
+        label:      'SuperGlue',
+        icon:       {
+                        "16": "./icon-16.png",
+                        "32": "./icon-32.png",
+                        "64": "./icon-64.png"
+                    },
+        onClick:    function() {
 
-        });
+            
+            var worker = tabs.activeTab.attach({
+                contentScriptFile:      self.data.url("content_probeForSG.js"),
+                contentScriptOptions:   { "dataPath" : self.data.url("superglue-client") + "/" }
+            });
 
-        worker.on('detach', function () {
-            detachWorker(this, workers);
-        });
+            
+            workers.push(worker);
 
-    }
-});
+            
 
+            worker.port.on('SuperGlueClipboard', function(message){
 
-var button = buttons.ActionButton({
+                if(message.action === 'copy'){
+                    clipboard.set(message.value);
+                }
 
-        id:         'superglue-button',
-        label:      'SuperGlue',
-        icon:       iconsOff,
-        onClick:    function() {
+                if(message.action === 'paste'){
+                    worker.port.emit('SuperGlueClipboard', {
+                        action: 'pasteResponse',
+                        value:  clipboard.get()
+                    })
+                }
 
-            powerSwitch = !powerSwitch;
+            });
 
-            for(var i = 0, l = workers.length; i < l; i++){
-                workers[i].port.emit('SuperGlueState', { contentProbeForSG: 'updateStatusOfSG' })
-            }
+            worker.on('detach', function () {
+                detachWorker(this, workers);
+            });
 
-            button.state(button, { icon: powerSwitch ? iconsOn : iconsOff });
-            
 
         }
+
     });