InformAction Forums

Code: Select all

--- resources/fmPlayerInitializer.old	2009-06-04 13:11:48.000000000 +0200
+++ resources/fmPlayerInitializer.js	2009-08-26 13:17:17.359375000 +0200
@@ -65,6 +65,4 @@ const STOPAUTOPLAY_UUID = "{2e61e246-e64
 const MEDIAWRAP_UUID = "{dd68c513-9296-4b63-8d8b-8f1c991c8a48}";
 
-// NoScript revert timeout
-const NOSCRIPT_TIMEOUT = 10000;
 // Flashblock and similar extensions timeout.
 const FLASHBLOCK_TIMEOUT = 100;
@@ -400,47 +398,12 @@ FireFM.PlayerInitializer = {
     try {
       // the extension could be disabled.
-      if (Cc["@maone.net/noscript-service;1"]) {
+      if ("@maone.net/noscript-service;1" in Cc) {
         let noscriptService =
           Cc["@maone.net/noscript-service;1"].getService().wrappedJSObject;
-        let trustedSites = noscriptService.jsPolicySites.clone();
-
-        if ("" == trustedSites.matches(aFlashURL)) {
-          trustedSites.add(aFlashURL);
-          noscriptService.setJSEnabled(trustedSites.sitesList, true, true);
-          this._logger.info("Noscript overridden");
-
-          // Revert the changes after the window loads
-          let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-          timer.initWithCallback(
-            { notify : function(aTimer) {
-              FireFM.PlayerInitializer._revertNoscript(aFlashURL); }},
-            NOSCRIPT_TIMEOUT, Ci.nsITimer.TYPE_ONE_SHOT);
-        }
+        noscriptService.setAllowedObject(aFlashURL, "application/x-shockwave-flash");               
       }
     } catch (e) {
       this._logger.warn("Error overriding Noscript: " + e);
     }
-  },
-
-  /**
-   * Reverts the changes that were made in the _overrideNoscript method to
-   * return the NoScript rules to their original state.
-   * @param aFlashURL The URL of the Fire.fm flash player.
-   */
-  _revertNoscript : function(aFlashURL) {
-    this._logger.trace("_revertNoscript");
-
-    try {
-      let noscriptService =
-        Cc["@maone.net/noscript-service;1"].getService().wrappedJSObject;
-      let trustedSites = noscriptService.jsPolicySites.clone();
-
-      trustedSites.remove([aFlashURL], true);
-      noscriptService.setJSEnabled(trustedSites.sitesList, true, true);
-      this._logger.info("Noscript reverted");
-
-    } catch (e) {
-      this._logger.warn("Error reverting Noscript changes: " + e);
-    }
   }
 };