テキスト比較

2 つのテキストファイルの違いを見つける

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

ツール

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 10 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

143 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

114 lines

/* This Source Code Form is subject to the terms of the Mozilla Public

* License, v. 2.0. If a copy of the MPL was not distributed with this

* License, v. 2.0. If a copy of the MPL was not distributed with this file,

* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

* You can obtain one at http://mozilla.org/MPL/2.0/. */

const wpl = Components.interfaces.nsIWebProgressListener;

var reporterListener = {

_isBusy: false,

get statusMeter() {

delete this.statusMeter;

return this.statusMeter = document.getElementById("statusbar-icon");

get securityButton() {

delete this.securityButton;

return this.securityButton = document.getElementById("security-button");

get securityLabel() {

delete this.securityLabel;

return this.securityLabel = document.getElementById("security-status");

get securityDisplay() {

delete this.securityDisplay;

return this.securityDisplay = document.getElementById("security-display");

QueryInterface: function(aIID) {

if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||

aIID.equals(Components.interfaces.nsISupportsWeakReference) ||

aIID.equals(Components.interfaces.nsISupports))

return this;

throw Components.results.NS_NOINTERFACE;

onStateChange: function(/*in nsIWebProgress*/ aWebProgress,

/*in nsIRequest*/ aRequest,

/*in unsigned long*/ aStateFlags,

/*in nsresult*/ aStatus) {

if (aStateFlags & wpl.STATE_START &&

aStateFlags & wpl.STATE_IS_NETWORK) {

this.statusMeter.value = 0;

this.statusMeter.parentNode.collapsed = false;

this.securityLabel.collapsed = true;

}

else if (aStateFlags & wpl.STATE_STOP &&

aStateFlags & wpl.STATE_IS_NETWORK) {

this.statusMeter.parentNode.collapsed = true;

this.securityLabel.collapsed = false;

}

onProgressChange: function(/*in nsIWebProgress*/ aWebProgress,

/*in nsIRequest*/ aRequest,

/*in long*/ aCurSelfProgress,

/*in long */aMaxSelfProgress,

/*in long */aCurTotalProgress,

/*in long */aMaxTotalProgress) {

if (aMaxTotalProgress > 0) {

let percentage = (aCurTotalProgress * 100) / aMaxTotalProgress;

this.statusMeter.value = percentage;

}

onLocationChange: function(/*in nsIWebProgress*/ aWebProgress,

/*in nsIRequest*/ aRequest,

/*in nsIURI*/ aLocation) {

this.securityDisplay.setAttribute('label', aLocation.host);

document.getElementById("headerMessage").textContent = aLocation.spec;

onStatusChange: function(/*in nsIWebProgress*/ aWebProgress,

/*in nsIRequest*/ aRequest,

/*in nsresult*/ aStatus,

/*in wstring*/ aMessage) {

onSecurityChange: function(/*in nsIWebProgress*/ aWebProgress,

/*in nsIRequest*/ aRequest,

/*in unsigned long*/ aState) {

const wpl_security_bits = wpl.STATE_IS_SECURE |

wpl.STATE_IS_BROKEN |

wpl.STATE_IS_INSECURE |

wpl.STATE_SECURE_HIGH |

wpl.STATE_SECURE_MED |

wpl.STATE_SECURE_LOW;

let browser = document.getElementById("requestFrame");

var browser = document.getElementById("requestFrame");

let level;

var level;

switch (aState & wpl_security_bits) {

case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_HIGH:

level = "high";

break;

case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_MED:

case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_LOW:

level = "low";

break;

case wpl.STATE_IS_BROKEN:

level = "broken";

break;

}

if (level) {

this.securityButton.setAttribute("level", level);

this.securityButton.hidden = false;

this.securityLabel.setAttribute("label", browser.securityUI.tooltipText);

} else {

this.securityButton.hidden = true;

this.securityButton.removeAttribute("level");

}

this.securityButton.setAttribute("tooltiptext",

browser.securityUI.tooltipText);

}

function cancelRequest()

{

reportUserClosed();

window.close();

}

function reportUserClosed()

{

let request = window.arguments[0];

let request = window.arguments[0].wrappedJSObject;

request.QueryInterface(Components.interfaces.prplIRequestBrowser);

request.cancelled();

}

function loadRequestedUrl()

{

let request = window.arguments[0];

let request = window.arguments[0].wrappedJSObject;

request.QueryInterface(Components.interfaces.prplIRequestBrowser);

document.getElementById("headerMessage").textContent = request.promptText;

let account = request.account;

document.getElementById("headerLabel").value =

if (request.iconURI != "")

account.protocol.name + " - " + account.name;

document.getElementById("headerImage").src = request.iconURI;

document.getElementById("headerImage").src =

account.protocol.iconBaseURI + "icon48.png";

let browser = document.getElementById("requestFrame");

var browser = document.getElementById("requestFrame");

browser.addProgressListener(reporterListener,

Components.interfaces.nsIWebProgress.NOTIFY_ALL);

let url = request.url;

var url = request.url;

if (url != "")

if (url != "") {

browser.setAttribute("src", url);

document.getElementById("headerMessage").textContent = url;

}

request.loaded(window, browser.webProgress);

}

保存された差分

原文

ファイルを開く

/* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

const wpl = Components.interfaces.nsIWebProgressListener;

QueryInterface: function(aIID) {
    if (aIID.equals(Components.interfaces.nsIWebProgressListener)   ||
        aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
        aIID.equals(Components.interfaces.nsISupports))
      return this;
    throw Components.results.NS_NOINTERFACE;
  },
  onStateChange: function(/*in nsIWebProgress*/ aWebProgress,
                     /*in nsIRequest*/ aRequest,
                     /*in unsigned long*/ aStateFlags,
                     /*in nsresult*/ aStatus) {
    if (aStateFlags & wpl.STATE_START &&
        aStateFlags & wpl.STATE_IS_NETWORK) {
      this.statusMeter.value = 0;
      this.statusMeter.parentNode.collapsed = false;
      this.securityLabel.collapsed = true;
    }
    else if (aStateFlags & wpl.STATE_STOP &&
             aStateFlags & wpl.STATE_IS_NETWORK) {
      this.statusMeter.parentNode.collapsed = true;
      this.securityLabel.collapsed = false;
    }
  },

onProgressChange: function(/*in nsIWebProgress*/ aWebProgress,
                        /*in nsIRequest*/ aRequest,
                        /*in long*/ aCurSelfProgress,
                        /*in long */aMaxSelfProgress,
                        /*in long */aCurTotalProgress,
                        /*in long */aMaxTotalProgress) {
    if (aMaxTotalProgress > 0) {
      let percentage = (aCurTotalProgress * 100) / aMaxTotalProgress;
      this.statusMeter.value = percentage;
    }
  },

onLocationChange: function(/*in nsIWebProgress*/ aWebProgress,
                        /*in nsIRequest*/ aRequest,
                        /*in nsIURI*/ aLocation) {
    this.securityDisplay.setAttribute('label', aLocation.host);
  },

onStatusChange: function(/*in nsIWebProgress*/ aWebProgress,
                      /*in nsIRequest*/ aRequest,
                      /*in nsresult*/ aStatus,
                      /*in wstring*/ aMessage) {
  },

onSecurityChange: function(/*in nsIWebProgress*/ aWebProgress,
                        /*in nsIRequest*/ aRequest,
                        /*in unsigned long*/ aState) {
    const wpl_security_bits = wpl.STATE_IS_SECURE |
                              wpl.STATE_IS_BROKEN |
                              wpl.STATE_IS_INSECURE |
                              wpl.STATE_SECURE_HIGH |
                              wpl.STATE_SECURE_MED |
                              wpl.STATE_SECURE_LOW;
    let browser = document.getElementById("requestFrame");
    let level;

switch (aState & wpl_security_bits) {
      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_HIGH:
        level = "high";
        break;
      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_MED:
      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_LOW:
        level = "low";
        break;
      case wpl.STATE_IS_BROKEN:
        level = "broken";
        break;
    }
    if (level) {
      this.securityButton.setAttribute("level", level);
      this.securityButton.hidden = false;
      this.securityLabel.setAttribute("label", browser.securityUI.tooltipText);
    } else {
      this.securityButton.hidden = true;
      this.securityButton.removeAttribute("level");
    }
    this.securityButton.setAttribute("tooltiptext",
                                     browser.securityUI.tooltipText);
  }
}

function cancelRequest()
{
  reportUserClosed();
  window.close();
}

function reportUserClosed()
{
  let request = window.arguments[0];
  request.QueryInterface(Components.interfaces.prplIRequestBrowser);
  request.cancelled();
}

function loadRequestedUrl()
{
  let request = window.arguments[0];
  request.QueryInterface(Components.interfaces.prplIRequestBrowser);
  document.getElementById("headerMessage").textContent = request.promptText;
  let account = request.account;
  document.getElementById("headerLabel").value =
    account.protocol.name + " - " + account.name;
  document.getElementById("headerImage").src =
    account.protocol.iconBaseURI + "icon48.png";

let browser = document.getElementById("requestFrame");
  browser.addProgressListener(reporterListener,
                              Components.interfaces.nsIWebProgress.NOTIFY_ALL);
  let url = request.url;
  if (url != "")
    browser.setAttribute("src", url);
  request.loaded(window, browser.webProgress);
}

変更されたテキスト

ファイルを開く

/* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */

const wpl = Components.interfaces.nsIWebProgressListener;

var reporterListener = {
  _isBusy: false,
  get securityButton() {
    delete this.securityButton;
    return this.securityButton = document.getElementById("security-button");
  },

onStateChange: function(/*in nsIWebProgress*/ aWebProgress,
                     /*in nsIRequest*/ aRequest,
                     /*in unsigned long*/ aStateFlags,
                     /*in nsresult*/ aStatus) {
  },

onLocationChange: function(/*in nsIWebProgress*/ aWebProgress,
                        /*in nsIRequest*/ aRequest,
                        /*in nsIURI*/ aLocation) {
    document.getElementById("headerMessage").textContent = aLocation.spec;
  },

onSecurityChange: function(/*in nsIWebProgress*/ aWebProgress,
                        /*in nsIRequest*/ aRequest,
                        /*in unsigned long*/ aState) {
    const wpl_security_bits = wpl.STATE_IS_SECURE |
                              wpl.STATE_IS_BROKEN |
                              wpl.STATE_IS_INSECURE |
                              wpl.STATE_SECURE_HIGH |
                              wpl.STATE_SECURE_MED |
                              wpl.STATE_SECURE_LOW;
    var browser = document.getElementById("requestFrame");
    var level;

switch (aState & wpl_security_bits) {
      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_HIGH:
        level = "high";
        break;
      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_MED:
      case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_LOW:
        level = "low";
        break;
      case wpl.STATE_IS_BROKEN:
        level = "broken";
        break;
    }
    if (level) {
      this.securityButton.setAttribute("level", level);
      this.securityButton.hidden = false;
    } else {
      this.securityButton.hidden = true;
      this.securityButton.removeAttribute("level");
    }
    this.securityButton.setAttribute("tooltiptext",
                                     browser.securityUI.tooltipText);
  }
}

function cancelRequest()
{
  reportUserClosed();
  window.close();
}

function reportUserClosed()
{
  let request = window.arguments[0].wrappedJSObject;
  request.cancelled();
}

function loadRequestedUrl()
{
  let request = window.arguments[0].wrappedJSObject;
  document.getElementById("headerMessage").textContent = request.promptText;
  let account = request.account;
  if (request.iconURI != "")
    document.getElementById("headerImage").src = request.iconURI;

var browser = document.getElementById("requestFrame");
  browser.addProgressListener(reporterListener,
                              Components.interfaces.nsIWebProgress.NOTIFY_ALL);
  var url = request.url;
  if (url != "") {
    browser.setAttribute("src", url);
    document.getElementById("headerMessage").textContent = url;
  }
  request.loaded(window, browser.webProgress);
}