From svnnotify @ sourceforge.jp Sat Jul 5 03:41:20 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 05 Jul 2008 03:41:20 +0900 Subject: [Bbs2ch-cvs 446] =?utf-8?b?WzQyOF0gWzA0X0JSQU5DSF0gIG5zSVRocmVhZCDjgpLlu4PmraI=?= =?utf-8?b?44GX44GmIEZ4MyDjgafli5XjgY/jgojjgYbjgavjgZfjgZ8=?= Message-ID: <1215196880.392463.575.nullmailer@users.sourceforge.jp> Revision: 428 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=428 Author: flyson Date: 2008-07-05 03:41:20 +0900 (Sat, 05 Jul 2008) Log Message: ----------- [04_BRANCH] nsIThread を廃止して Fx3 で動くようにした Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/components/b2rServer.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/components/b2rServer.js =================================================================== --- branches/bbs2chreader/04_BRANCH/components/b2rServer.js 2008-04-22 13:18:06 UTC (rev 427) +++ branches/bbs2chreader/04_BRANCH/components/b2rServer.js 2008-07-04 18:41:20 UTC (rev 428) @@ -148,10 +148,12 @@ return; } - this._thread = XPC.createInstance("@mozilla.org/thread;1", "nsIThread"); - this._thread.init(this, 0, Ci.nsIThread.PRIORITY_NORMAL, - Ci.nsIThread.SCOPE_GLOBAL, Ci.nsIThread.STATE_JOINABLE); - dump("b2rServer.start\n"); + var port = XPC.getService("@mozilla.org/bbs2ch-service;1", "nsIBbs2chService").serverURL.port; + var serverSocket = XPC.createInstance("@mozilla.org/network/server-socket;1", "nsIServerSocket"); + serverSocket.init(port, true, 10); + serverSocket.asyncListen(this); + + dump("b2rServer.run : Start Listening Port " + port + "\n"); }, stop: function(){ @@ -163,30 +165,6 @@ }, - // ********** ********* implements nsIRunnable ********** ********** - - run: function (){ - var eventQueueService = XPC.getService("@mozilla.org/event-queue-service;1", "nsIEventQueueService"); - this._eventQueue = eventQueueService.createFromIThread(this.currentThread, false); - - var port = XPC.getService("@mozilla.org/bbs2ch-service;1", "nsIBbs2chService").serverURL.port; - var serverSocket = XPC.createInstance("@mozilla.org/network/server-socket;1", "nsIServerSocket"); - serverSocket.init(port, true, 10); - serverSocket.asyncListen(this); - - dump("b2rServer.run : Start Listening Port " + port + "\n"); - this._listening = true; - this._eventQueue.eventLoop(); - this._listening = false; - serverSocket.close(); - this._eventQueue.processPendingEvents(); - this._eventQueue.stopAcceptingEvents(); - this._eventQueue.processPendingEvents(); - this._eventQueue = null; - dump("b2rServer.run : Stop Listening Port " + port + "\n"); - }, - - // ********** ********* implements nsIServerSocketListener ********** ********** onSocketAccepted: function(aServerSocket, aTransport){ @@ -297,14 +275,9 @@ this._getData = new Array(); this._requestBuffer = ""; - this._input.asyncWait(this, 0, 0, this._getMainThread()); + this._input.asyncWait(this, 0, 0, Cc["@mozilla.org/thread-manager;1"].getService().mainThread); }, - _getMainThread: function(){ - var eventQueueService = XPC.getService("@mozilla.org/event-queue-service;1", "nsIEventQueueService"); - return eventQueueService.getSpecialEventQueue(Ci.nsIEventQueueService.UI_THREAD_EVENT_QUEUE); - }, - onInputStreamReady: function(aInput){ var available = aInput.available(); var bInputStream = XPC.createInstance("@mozilla.org/binaryinputstream;1", "nsIBinaryInputStream"); @@ -313,7 +286,7 @@ if((/\r\n\r\n/).test(this._requestBuffer)){ this._parseRequestData(); }else{ - this._input.asyncWait(this, 0, 0, this._getMainThread()); + this._input.asyncWait(this, 0, 0, Cc["@mozilla.org/thread-manager;1"].getService().mainThread); } }, From svnnotify @ sourceforge.jp Sat Jul 5 03:43:02 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 05 Jul 2008 03:43:02 +0900 Subject: [Bbs2ch-cvs 447] =?utf-8?b?WzQyOV0gWzA0X0JSQU5DSF0gIFhNTCDjga7oqq3jgb/ovrzjgb8=?= =?utf-8?b?44GrIFhNTEh0dHBSZXF1ZXN0IOOCkuS9v+OBhuOCiOOBhuOBq+OBl+OBnw==?= Message-ID: <1215196982.694910.1761.nullmailer@users.sourceforge.jp> Revision: 429 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=429 Author: flyson Date: 2008-07-05 03:43:02 +0900 (Sat, 05 Jul 2008) Log Message: ----------- [04_BRANCH] XML の読み込みに XMLHttpRequest を使うようにした Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/bbsmenu/page.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/bbsmenu/page.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/bbsmenu/page.js 2008-07-04 18:41:20 UTC (rev 428) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/bbsmenu/page.js 2008-07-04 18:43:02 UTC (rev 429) @@ -52,9 +52,11 @@ var ioService = Components.classes["@mozilla.org/network/io-service;1"] .getService(Components.interfaces.nsIIOService); var bbsMenuXMLURL = ioService.newFileURI(gBbsMenuXMLFile); - var bbsmenuDoc = document.implementation.createDocument("", "", null); - bbsmenuDoc.async = false; - bbsmenuDoc.load(bbsMenuXMLURL.spec); + var httpReq = new XMLHttpRequest(); + httpReq.open("GET", bbsMenuXMLURL.spec, false); + httpReq.send(null); + var bbsmenuDoc = httpReq.responseXML; + delete httpReq; // 外部板 var outsidexmlFile = gBbs2chService.getDataDir(); @@ -65,9 +67,11 @@ gBbs2chService.writeFile(outsidexmlFile.path, outsideContent, false); } var outsideXMLURL = ioService.newFileURI(outsidexmlFile); - var outsideDoc = document.implementation.createDocument("", "", null); - outsideDoc.async = false; - outsideDoc.load(outsideXMLURL.spec); + var httpReq = new XMLHttpRequest(); + httpReq.open("GET", outsideXMLURL.spec, false); + httpReq.send(null); + var outsideDoc = httpReq.responseXML + delete httpReq; // outsideDoc.documentElement.appendChild(outsideDoc.createElement("separator")); From svnnotify @ sourceforge.jp Sat Jul 5 03:44:28 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 05 Jul 2008 03:44:28 +0900 Subject: [Bbs2ch-cvs 448] =?utf-8?b?WzQzMF0gWzA0X0JSQU5DSF0gIOODkOODiuODvOOBjOihqOekug==?= =?utf-8?b?44Gn44GN44Gq44GP44Gq44Gj44Gm44GE44Gf44Gu44KS5L+u5q2j?= Message-ID: <1215197068.723098.3050.nullmailer@users.sourceforge.jp> Revision: 430 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=430 Author: flyson Date: 2008-07-05 03:44:28 +0900 (Sat, 05 Jul 2008) Log Message: ----------- [04_BRANCH] バナーが表示できなくなっていたのを修正 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.js branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.xul -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.js 2008-07-04 18:43:02 UTC (rev 429) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.js 2008-07-04 18:44:28 UTC (rev 430) @@ -620,23 +620,26 @@ function showBanner(aEvent){ if(aEvent.type=="click" && aEvent.button!=0) return; - var imgBanner = document.getElementById("imgBanner"); + var imgBanner = document.getElementById("imgHiddenBanner"); imgBanner.removeAttribute("src"); imgBanner.setAttribute("src", gBoardItems.logoURL.spec); } function bannerLoaded(){ var imgBanner = document.getElementById("imgBanner"); + imgBanner.setAttribute("src", gBoardItems.logoURL.spec); + var lblShowBanner = document.getElementById("lblShowBanner"); var popBanner = document.getElementById("popBanner"); - var imgWidth = imgBanner.boxObject.width; + popBanner.openPopup(lblShowBanner, 0, 0, "end", false, true); +} - var x = lblShowBanner.boxObject.screenX - imgWidth/1.5; - var y = lblShowBanner.boxObject.screenY + 10; - popBanner.showPopup(lblShowBanner, x, y, "popup", "end"); +function bannerLoadError(aEvent){ + } + /** * ブックマークに追加 * @param aLiveBookmark boolean 真ならライブブックマークとして追加 Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.xul =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.xul 2008-07-04 18:43:02 UTC (rev 429) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.xul 2008-07-04 18:44:28 UTC (rev 430) @@ -41,12 +41,12 @@ - - + + + From svnnotify @ sourceforge.jp Sat Jul 5 03:49:31 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 05 Jul 2008 03:49:31 +0900 Subject: [Bbs2ch-cvs 449] =?utf-8?b?WzQzMV0gWzA0X0JSQU5DSF0gIOODneODg+ODl+OCouODg+ODlw==?= =?utf-8?b?6IOM5pmv6YCP6YGO44KS55S75YOP44GL44KJIHJnYmEgKCkgIOaMh+Wumg==?= =?utf-8?b?44Gr5aSJ5pu0?= Message-ID: <1215197371.410050.5935.nullmailer@users.sourceforge.jp> Revision: 431 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=431 Author: flyson Date: 2008-07-05 03:49:31 +0900 (Sat, 05 Jul 2008) Log Message: ----------- [04_BRANCH] ?????????????????糸???? rgba() ???????? Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/defaults/skin/style.css -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/defaults/skin/style.css =================================================================== --- branches/bbs2chreader/04_BRANCH/defaults/skin/style.css 2008-07-04 18:44:28 UTC (rev 430) +++ branches/bbs2chreader/04_BRANCH/defaults/skin/style.css 2008-07-04 18:49:31 UTC (rev 431) @@ -49,7 +49,7 @@ #navMenu ul{ padding: 0px; margin: 0px; - background: transparent url('popup-back.png'); + background-color: rgba(60, 60, 60, 0.85); } #navMenu li{ @@ -130,9 +130,8 @@ /* ***** ***** ?????? ***** ***** */ div.popup { padding: 10px; - -moz-outline: 2px solid #555; - -moz-outline-radius: 8px; - background: transparent url('popup-back.png'); + -moz-border-radius: 8px; + background-color: rgba(60, 60, 60, 0.85); color: #F6F6F6; position: absolute; font-size: 0.8em; @@ -144,7 +143,7 @@ div.imagePopup { padding: 0px; border: 1px solid #555; - background: transparent url('popup-back.png'); + background-color: rgba(60, 60, 60, 0.85); position: absolute; left: -1000px; top: -1000px; From svnnotify @ sourceforge.jp Sat Jul 5 04:01:37 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 05 Jul 2008 04:01:37 +0900 Subject: [Bbs2ch-cvs 450] =?utf-8?b?WzQzMl0gWzA0X0JSQU5DSF0gVmVyIDAuNC4xMyAoIEZpcmVmb3gz?= =?utf-8?b?IOWvvuW/nCAp?= Message-ID: <1215198097.797781.13914.nullmailer@users.sourceforge.jp> Revision: 432 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=432 Author: flyson Date: 2008-07-05 04:01:37 +0900 (Sat, 05 Jul 2008) Log Message: ----------- [04_BRANCH] Ver 0.4.13 (Firefox3 対応) Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/install.rdf -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/install.rdf =================================================================== --- branches/bbs2chreader/04_BRANCH/install.rdf 2008-07-04 18:49:31 UTC (rev 431) +++ branches/bbs2chreader/04_BRANCH/install.rdf 2008-07-04 19:01:37 UTC (rev 432) @@ -2,31 +2,21 @@ - - bbs2chreader - {0B9D558E-6983-486b-9AAD-B6CBCD2FC807} - 0.4.12 - 2ch.net(Japanese Web Forums) Browser - chrome://bbs2chreader/content/settings/settings.xul - http://bbs2ch.sourceforge.jp/ - chrome://bbs2chreader/content/icon.png - flyson + Nazo - - {ec8030f7-c20a-464f-9b0e-13a3a9e97384} - 2.0 - 2.0.0.* - - + + - \ No newline at end of file From svnnotify @ sourceforge.jp Sat Jul 5 04:05:26 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 05 Jul 2008 04:05:26 +0900 Subject: [Bbs2ch-cvs 451] =?utf-8?b?WzQzM10gWzA0X0JSQU5DSF0gIHByb3RvY29sRmxhZ3Mg44GrIFVS?= =?utf-8?b?SV9MT0FEQUJMRV9CWV9BTllPTkUg44KS6L+95Yqg?= Message-ID: <1215198326.770661.16438.nullmailer@users.sourceforge.jp> Revision: 433 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=433 Author: flyson Date: 2008-07-05 04:05:26 +0900 (Sat, 05 Jul 2008) Log Message: ----------- [04_BRANCH] protocolFlags に URI_LOADABLE_BY_ANYONE を追加 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/components/b2rProtocolHandler.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/components/b2rProtocolHandler.js =================================================================== --- branches/bbs2chreader/04_BRANCH/components/b2rProtocolHandler.js 2008-07-04 19:01:37 UTC (rev 432) +++ branches/bbs2chreader/04_BRANCH/components/b2rProtocolHandler.js 2008-07-04 19:05:26 UTC (rev 433) @@ -84,9 +84,11 @@ scheme: "bbs2ch", defaultPort: -1, - protocolFlags: Ci.nsIProtocolHandler.URI_NOAUTH, + // XXX 設計を見直して URI_LOADABLE_BY_ANYONE をやめるようにする + protocolFlags: Ci.nsIProtocolHandler.URI_NOAUTH | Ci.nsIProtocolHandler.URI_LOADABLE_BY_ANYONE, + allowPort: function(aPort, aScheme){ return false; }, From svnnotify @ sourceforge.jp Wed Aug 27 22:10:12 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 27 Aug 2008 22:10:12 +0900 Subject: [Bbs2ch-cvs 452] =?utf-8?b?WzQzNF0gWzA0X0JSQU5DSF0g44G+44GhQkJTIG9mZmxhdyDlr74=?= =?utf-8?b?5b+c?= Message-ID: <1219842612.993784.12558.nullmailer@users.sourceforge.jp> Revision: 434 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=434 Author: flyson Date: 2008-08-27 22:10:12 +0900 (Wed, 27 Aug 2008) Log Message: ----------- [04_BRANCH]?障?BBS offlaw 絲上? Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/items.js branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.js branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js branches/bbs2chreader/04_BRANCH/components/nsBbs2chService.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/items.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/items.js 2008-07-04 19:05:26 UTC (rev 433) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/items.js 2008-08-27 13:10:12 UTC (rev 434) @@ -193,11 +193,11 @@ var charset = "Shift_JIS"; switch(this.type){ case this._bbs2chService.BOARD_TYPE_2CH: + case this._bbs2chService.BOARD_TYPE_MACHI: charset = "Shift_JIS"; break; case this._bbs2chService.BOARD_TYPE_BE2CH: case this._bbs2chService.BOARD_TYPE_JBBS: - case this._bbs2chService.BOARD_TYPE_MACHI: charset = "euc-jp"; break; } @@ -266,9 +266,10 @@ threadUrlSpec = baseUrlSpec + "bbs/read.cgi/" + categoryPath; break; case this._bbs2chService.BOARD_TYPE_MACHI: - categoryPath = this.url.directory.replace(/\//g, ""); baseUrlSpec = this.url.resolve("../"); - threadUrlSpec = baseUrlSpec + "bbs/read.cgi?BBS=" + categoryPath; + categoryPath = this.url.spec.substring(baseUrlSpec.length); + threadUrlSpec = baseUrlSpec + "bbs/read.cgi/" + categoryPath; + break; } @@ -294,9 +295,6 @@ item.force = this.getThreadForce(item.datID, item.count); item.makeDate = this._getFormatedDate(new Date(item.datID * 1000)); item.url = threadUrlSpec + item.datID + "/"; - if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){ - item.url = threadUrlSpec + "&KEY=" + item.datID; - } if(logItemHash.hasOwnProperty("item-" + item.datID)){ var logItem = logItemHash["item-" + item.datID]; @@ -393,9 +391,6 @@ logItem.force = 0; logItem.makeDate = this._getFormatedDate(new Date(logItem.datID * 1000)); logItem.url = aThreadUrlSpec + logItem.datID + "/"; - if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){ - logItem.url = aThreadUrlSpec + "&KEY=" + logItem.datID; - } if(logItem.id in cacheItemHash && cacheItemHash[logItem.id].lastModified == lastModified){ @@ -468,4 +463,4 @@ } -} \ No newline at end of file +} Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.js 2008-07-04 19:05:26 UTC (rev 433) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/board/page.js 2008-08-27 13:10:12 UTC (rev 434) @@ -313,11 +313,7 @@ if(isNaN(threadViewLimit) || threadViewLimit == 0){ threadViewLimit = ""; }else{ - if(gBoardItems.type == gBbs2chService.BOARD_TYPE_MACHI){ - threadViewLimit = "&LAST=" + threadViewLimit; - }else{ threadViewLimit = "l" + threadViewLimit; - } } var url = "/thread/" + gBoardItems.items[index].url + threadViewLimit; Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js 2008-07-04 19:05:26 UTC (rev 433) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js 2008-08-27 13:10:12 UTC (rev 434) @@ -741,27 +741,14 @@ } b2rThreadMachi.prototype = { - get optionsStart(){ - return (this.dat.queryHash["START"]) ? parseInt(this.dat.queryHash["START"]) : null; - }, - get optionsLast(){ - return (this.dat.queryHash["LAST"]) ? parseInt(this.dat.queryHash["LAST"]) : null; - }, - get optionsEnd(){ - return (this.dat.queryHash["END"]) ? parseInt(this.dat.queryHash["END"]) : null; - }, - get optionsNoFirst(){ - return (this.dat.queryHash["NOFIRST"] == "TRUE") ? true : false; - }, - datDownload: function(){ - var datURLSpec = this.dat.datURL.spec + var datURLSpec = this.dat.threadURL.resolve("./").replace("read.cgi", "offlaw.cgi"); this._aboneChecked = true; this._threadAbone = false; // ??GET if(this.dat.datFile.exists() && this.dat.lineCount){ - datURLSpec += "&NOFIRST=TRUE&START=" + (this.dat.lineCount + 1); + datURLSpec += (this.dat.lineCount + 1) + "-"; } var datURL = this._ioService.newURI(datURLSpec, null, null) .QueryInterface(Components.interfaces.nsIURL); @@ -774,106 +761,13 @@ this.httpChannel.asyncOpen(this, null); }, - onStartRequest: function(aRequest, aContext){ - this._bInputStream = Components.classes["@mozilla.org/binaryinputstream;1"] - .createInstance(Components.interfaces.nsIBinaryInputStream); - this._htmlData = new Array(); - }, + datLineParse: function(aLine, aNumber, aNew){ + var resArray = aLine.split("<>"); + resArray.shift(); + var super = b2rThread2ch.prototype.datLineParse; + return super.apply(this, [resArray.join("<>"), aNumber, aNew]); + } - onDataAvailable: function (aRequest, aContext, aInputStream, aOffset, aCount){ - if(!this._opend) return; - - aRequest.QueryInterface(Components.interfaces.nsIHttpChannel); - var httpStatus = aRequest.responseStatus; - // ??????????I? - if(!(httpStatus==200 || httpStatus==206)) return; - if(aCount == 0) return; - - this._bInputStream.setInputStream(aInputStream); - var availableData = this._bInputStream.readBytes(aCount); - // NULL ?? - availableData = availableData.replace(/\x00/g, "*"); - - this._htmlData.push(availableData); - this.write(" "); - }, - - onStopRequest: function(aRequest, aContext, aStatus){ - if(!this._opend) return; - - this._bInputStream = null; - aRequest.QueryInterface(Components.interfaces.nsIHttpChannel); - var httpStatus = aRequest.responseStatus; - - switch(httpStatus){ - case 200: // ??ET OK - case 206: // ??GET OK - break; - default: // HTTP ??? - this.write(this.converter.getFooter(httpStatus)); - this.close(); - return; - } - - var datLines = this.machiHTML2DAT(this._htmlData.join("")); - this._htmlData = null; - - if(datLines.length == 0){ // ??? - this.write(this.converter.getFooter("not_modified")); - this.close(); - return; - } - - for(var i=0; i/gm, " ]"); - datLines = datLines.split("\n"); - - // ?????????????????- var reg = /^<(?:title>|dt>\d)/; - datLines = datLines.filter(function(aElement, aIndex, aArray){ - return reg.test(aElement); - }); - - // ??????????? - var datTitle = datLines.shift().replace(/<\/?title>/g, ""); - - datLines = datLines.map(function(aElement, aIndex, aArray){ - var datLine = aElement; - var name = (datLine.match(/ ([^<]+) <\/b>/i)) ? RegExp.$1 : ""; - var mail = (datLine.match(//i)) ? RegExp.$1 : ""; - var date = (datLine.match(/???? ([^<]+)
/)) ? RegExp.rightContext : ""; - message = message.replace(/

$/, ""); - message = message.replace(/
([^<]+)<\/a>/g, "$1"); - var datNumber = (datLine.match(/
(\d+) ??/)) ? parseInt(RegExp.$1) : 0; - var title = (datNumber==1) ? datTitle : ""; - return name +"<>"+ mail +"<>"+ date +"<>"+ message +"<>" + title; - }); - - return datLines; - } - }; b2rThreadMachi.prototype.__proto__ = b2rThread2ch.prototype; @@ -890,13 +784,9 @@ get threadPlainURL(){ if(!this._threadPlainURL){ - if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){ - this._threadPlainURL = this.datURL; - }else{ - var threadPlainSpec = this.threadURL.resolve("./"); - this._threadPlainURL = this._ioService.newURI(threadPlainSpec, null, null) - .QueryInterface(Components.interfaces.nsIURL); - } + var threadPlainSpec = this.threadURL.resolve("./"); + this._threadPlainURL = this._ioService.newURI(threadPlainSpec, null, null) + .QueryInterface(Components.interfaces.nsIURL); } return this._threadPlainURL; }, @@ -908,8 +798,7 @@ get datURL(){ if(!this._datURL){ if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){ - var datURLSpec = this.threadURL.resolve("./read.cgi"); - datURLSpec += "?BBS=" + this.queryHash["BBS"] + "&KEY=" + this.queryHash["KEY"]; + var datURLSpec = this.threadURL.spec.replace("/read.cgi/", "/offlaw.cgi/") + this.id + "/"; this._datURL = this._ioService.newURI(datURLSpec, null, null) .QueryInterface(Components.interfaces.nsIURL); }else{ @@ -950,11 +839,7 @@ get id(){ if(!this._id){ - if(this.type == this._bbs2chService.BOARD_TYPE_MACHI){ - this._id = this.queryHash["KEY"] || null; - }else{ - this._id = this.threadURL.directory.match(/\/(\d{9,10})/) ? RegExp.$1 : null; - } + this._id = this.threadURL.directory.match(/\/(\d{9,10})/) ? RegExp.$1 : null; } return this._id; }, @@ -1351,4 +1236,4 @@ return false; } -}; \ No newline at end of file +}; Modified: branches/bbs2chreader/04_BRANCH/components/nsBbs2chService.js =================================================================== --- branches/bbs2chreader/04_BRANCH/components/nsBbs2chService.js 2008-07-04 19:05:26 UTC (rev 433) +++ branches/bbs2chreader/04_BRANCH/components/nsBbs2chService.js 2008-08-27 13:10:12 UTC (rev 434) @@ -372,11 +372,10 @@ boardURLSpec = boardURLSpec.replace("/test/read.cgi/", "/"); break; case this.BOARD_TYPE_JBBS: + case this.BOARD_TYPE_MACHI: boardURLSpec = boardURLSpec.replace("/bbs/read.cgi/", "/"); break; case this.BOARD_TYPE_OLD2CH: - case this.BOARD_TYPE_MACHI: - boardURLSpec += url.query.match(/bbs=(\w+)/i) ? RegExp.$1 + "/" : null; break; } return this._ioService.newURI(boardURLSpec, null, null) @@ -883,4 +882,4 @@ function NSGetModule(aCompMgr, aFileSpec){ return Module; -} \ No newline at end of file +} From svnnotify @ sourceforge.jp Sun Sep 7 02:04:49 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 07 Sep 2008 02:04:49 +0900 Subject: [Bbs2ch-cvs 453] =?utf-8?b?WzQzNV0gIOOBvuOBoUJCU+OBrkRBVOihjOaVsOOBqOacgOe1gg==?= =?utf-8?b?44Os44K555Wq5Y+344GM6YGV44GG44Go44GN44Gr5beu5YiGR0VU44GM44Ga?= =?utf-8?b?44KM44KL5ZWP6aGM44KS5L+u5q2j?= Message-ID: <1220720689.582986.13049.nullmailer@users.sourceforge.jp> Revision: 435 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=435 Author: flyson Date: 2008-09-07 02:04:49 +0900 (Sun, 07 Sep 2008) Log Message: ----------- ?障?BBS??AT茵?????腟???合??激?????????勲??ET???????馹??篆?? Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js 2008-08-27 13:10:12 UTC (rev 434) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js 2008-09-06 17:04:49 UTC (rev 435) @@ -763,11 +763,25 @@ datLineParse: function(aLine, aNumber, aNew){ var resArray = aLine.split("<>"); - resArray.shift(); + var tureNumber = parseInt(resArray.shift()); var super = b2rThread2ch.prototype.datLineParse; - return super.apply(this, [resArray.join("<>"), aNumber, aNew]); - } + return super.apply(this, [resArray.join("<>"), tureNumber, aNew]); + }, + + datSave: function(aDatContent){ + if(aDatContent){ + // ????????????? DAT ??????X????? + // ???????????????????X????????? + var lines = aDatContent.split("\n"); + var lastLine = lines.pop(); // ???? + if(!lastLine) lastLine = lines.pop(); + this.dat.lineCount = parseInt(lastLine.match(/^\d+/)); + } + var super = b2rThread2ch.prototype.datSave; + return super.apply(this, arguments); + } + }; b2rThreadMachi.prototype.__proto__ = b2rThread2ch.prototype; From svnnotify @ sourceforge.jp Sun Sep 7 02:11:45 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 07 Sep 2008 02:11:45 +0900 Subject: [Bbs2ch-cvs 454] =?utf-8?b?WzQzNl0gIOOCreODvOODnOODvOODieOCt+ODp+ODvOODiOOCqw==?= =?utf-8?b?44OD44OI44KS44CAQ3RybCsgIihDdHJsK1NoaWZ0KzIpICDjgavlpInmm7Q=?= Message-ID: <1220721105.192875.18390.nullmailer@users.sourceforge.jp> Revision: 436 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=436 Author: flyson Date: 2008-09-07 02:11:45 +0900 (Sun, 07 Sep 2008) Log Message: ----------- キーボードショートカットを Ctrl+"(Ctrl+Shift+2) に変更 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/ff-overlay.xul -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/ff-overlay.xul =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/ff-overlay.xul 2008-09-06 17:04:49 UTC (rev 435) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/ff-overlay.xul 2008-09-06 17:11:45 UTC (rev 436) @@ -19,7 +19,7 @@ + key=""" modifiers="accel"/> From svnnotify @ sourceforge.jp Mon Sep 8 20:57:17 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 08 Sep 2008 20:57:17 +0900 Subject: [Bbs2ch-cvs 455] [437] [04_BRANCH] ver 0.4.14 Message-ID: <1220875037.209358.24045.nullmailer@users.sourceforge.jp> Revision: 437 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=437 Author: flyson Date: 2008-09-08 20:57:17 +0900 (Mon, 08 Sep 2008) Log Message: ----------- [04_BRANCH] ver 0.4.14 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/install.rdf -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/install.rdf =================================================================== --- branches/bbs2chreader/04_BRANCH/install.rdf 2008-09-06 17:11:45 UTC (rev 436) +++ branches/bbs2chreader/04_BRANCH/install.rdf 2008-09-08 11:57:17 UTC (rev 437) @@ -4,7 +4,7 @@ Revision: 438 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=438 Author: flyson Date: 2008-09-14 00:01:45 +0900 (Sun, 14 Sep 2008) Log Message: ----------- [04_BRANCH] スペルミス修正 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js 2008-09-08 11:57:17 UTC (rev 437) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js 2008-09-13 15:01:45 UTC (rev 438) @@ -763,9 +763,9 @@ datLineParse: function(aLine, aNumber, aNew){ var resArray = aLine.split("<>"); - var tureNumber = parseInt(resArray.shift()); + var trueNumber = parseInt(resArray.shift()); var super = b2rThread2ch.prototype.datLineParse; - return super.apply(this, [resArray.join("<>"), tureNumber, aNew]); + return super.apply(this, [resArray.join("<>"), trueNumber, aNew]); }, From svnnotify @ sourceforge.jp Tue Sep 16 22:42:54 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 16 Sep 2008 22:42:54 +0900 Subject: [Bbs2ch-cvs 457] =?utf-8?b?WzQzOV0gWzA0X0JSQU5DSF0gIOabuOOBjei+vOOBv+S7leanmA==?= =?utf-8?b?5aSJ5pu05a++5b+c?= Message-ID: <1221572574.302962.29861.nullmailer@users.sourceforge.jp> Revision: 439 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=439 Author: flyson Date: 2008-09-16 22:42:54 +0900 (Tue, 16 Sep 2008) Log Message: ----------- [04_BRANCH] ?吾?莨若?篁??紊??絲上? Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post-wizard.js branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post-wizard.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post-wizard.js 2008-09-13 15:01:45 UTC (rev 438) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post-wizard.js 2008-09-16 13:42:54 UTC (rev 439) @@ -157,12 +157,12 @@ /** * 書き込み */ -function post(){ +function post(aAdditionalData){ document.getElementById("wizPostWizard").getButton("back").disabled = true; document.getElementById("wizPostWizard").getButton("finish").disabled = true; gTxtResponse.value = ""; document.getElementById("btnRePost").disabled = true; - gPost.post(postListener); + gPost.post(postListener, aAdditionalData); } /** @@ -222,6 +222,27 @@ window.close(); }else if(status==gPost.COOKIE && !rewrite){ rewrite = true; + + try{ + var doc = document.implementation.createDocument("", "", null); + doc.appendChild(doc.createElement("root")); + var unescapeHTML = Components.classes["@mozilla.org/feed-unescapehtml;1"] + .getService(Components.interfaces.nsIScriptableUnescapeHTML); + var fragment = unescapeHTML.parseFragment(aResponse, false, null, doc.documentElement); + doc.documentElement.appendChild(fragment); + var inputNodes = doc.getElementsByTagName("input"); + var additionalData = new Array(); + var ignoreInputs = ["submit","subject","bbs","key","time","MESSAGE","FROM","mail"]; + for(var [i, input] in Iterator(inputNodes)){ + if(input.type != "hidden") continue; + if(ignoreInputs.indexOf(input.name) != -1) continue; + additionalData.push(input.name +"="+ input.value); + } + post(additionalData); + return; + }catch(ex){ + + } post(); }else if(status==gPost.ERROR || status==gPost.SAMBA){ alert(hardCoatingStr("書き込み中にエラーが発生しました")); @@ -374,4 +395,4 @@ } chkBeLogin.checked = Bbs2chBeLogin.logined; -} \ No newline at end of file +} Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post.js 2008-09-13 15:01:45 UTC (rev 438) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post.js 2008-09-16 13:42:54 UTC (rev 439) @@ -282,7 +282,7 @@ } return aString; }, - post: function(aListener){ + post: function(aListener, additionalData){ this.listener = aListener; // DAT ID this.threadURI.spec.match(/\/(\d{9,10})/); @@ -305,6 +305,9 @@ var postData = new Array(postSubmit, postBbs, postKey, postTime, postMsg, postName, postMail, postHana); + if(additionalData){ + postData = postData.concat(additionalData); + } if(this._bbs2chService.maruLogined){ var sid = "sid=" + encodeURIComponent(this._bbs2chService.maruSessionID); @@ -358,4 +361,4 @@ } return this.UNKNOWN; } -} \ No newline at end of file +} From svnnotify @ sourceforge.jp Tue Sep 16 22:58:14 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 16 Sep 2008 22:58:14 +0900 Subject: [Bbs2ch-cvs 458] [440] [04_BRANCH] ver 0.4.15 Message-ID: <1221573494.745312.9310.nullmailer@users.sourceforge.jp> Revision: 440 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=440 Author: flyson Date: 2008-09-16 22:58:14 +0900 (Tue, 16 Sep 2008) Log Message: ----------- [04_BRANCH] ver 0.4.15 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/install.rdf -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/install.rdf =================================================================== --- branches/bbs2chreader/04_BRANCH/install.rdf 2008-09-16 13:42:54 UTC (rev 439) +++ branches/bbs2chreader/04_BRANCH/install.rdf 2008-09-16 13:58:14 UTC (rev 440) @@ -4,7 +4,7 @@ Revision: 441 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=441 Author: flyson Date: 2008-09-17 00:25:49 +0900 (Wed, 17 Sep 2008) Log Message: ----------- [04_BRANCH] JBBS?????BS?????昭?水?綽? Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post-wizard.js branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post-wizard.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post-wizard.js 2008-09-16 13:58:14 UTC (rev 440) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post-wizard.js 2008-09-16 15:25:49 UTC (rev 441) @@ -72,13 +72,7 @@ if(!gPost.isSupport()){ switch(gPost.type){ - case gBbs2chService.TYPE_JBBS: - alert("JBBS NOT SUPPORTED"); - break; - case gBbs2chService.TYPE_MACHI: - alert("MACHI-BBS NOT SUPPORTED"); - break; - case gBbs2chService.TYPE_PAGE: + case gBbs2chService.BOARD_TYPE_PAGE: alert("BAD URL"); break; default: @@ -181,7 +175,7 @@ var response = gBbs2chService.fromType(aResponseText, gPost.type); gTxtResponse.value += htmlToText(response) + "\n"; - postCheck(response); + postCheck(response, aStatus); }catch(e){alert(e)} }, @@ -213,8 +207,8 @@ * 書き込みが成功したか確認する * @param aResponse string サーバが返すレスポンステキスト */ -function postCheck(aResponse){ - var status = gPost.getStatus(aResponse); +function postCheck(aResponse, aStatus){ + var status = gPost.getStatus(aResponse, aStatus); if(status==gPost.SUCCESS){ alert(hardCoatingStr("書き込みました")); Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post.js 2008-09-16 13:58:14 UTC (rev 440) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/post.js 2008-09-16 15:25:49 UTC (rev 441) @@ -77,13 +77,13 @@ isSupport:function(){ switch(this.type){ - case this._bbs2chService.BOARD_TYPE_JBBS: - case this._bbs2chService.BOARD_TYPE_MACHI: case this._bbs2chService.BOARD_TYPE_PAGE: case this._bbs2chService.BOARD_TYPE_OLD2CH: return false; case this._bbs2chService.BOARD_TYPE_2CH: case this._bbs2chService.BOARD_TYPE_BE2CH: + case this._bbs2chService.BOARD_TYPE_JBBS: + case this._bbs2chService.BOARD_TYPE_MACHI: return true; default: return false; @@ -238,7 +238,19 @@ return Math.ceil(new Date(lastModified).getTime() / 1000); }, get _postURI(){ - var postURISpec = this.boardURI.resolve("../test/bbs.cgi"); + var postURISpec; + switch(this.type){ + case this._bbs2chService.BOARD_TYPE_2CH: + case this._bbs2chService.BOARD_TYPE_BE2CH: + postURISpec = this.boardURI.resolve("../test/bbs.cgi"); + break; + case this._bbs2chService.BOARD_TYPE_JBBS: + postURISpec = this.threadURI.spec.replace("read.cgi", "write.cgi"); + break; + case this._bbs2chService.BOARD_TYPE_MACHI: + postURISpec = this.boardURI.resolve("../bbs/write.cgi"); + break; + } var postURI = this._ioService.newURI(postURISpec, null, null) .QueryInterface(Components.interfaces.nsIURL); return postURI; @@ -258,9 +270,11 @@ var charset = ""; switch(this.type){ case this._bbs2chService.BOARD_TYPE_2CH: + case this._bbs2chService.BOARD_TYPE_MACHI: charset = "Shift_JIS"; break; case this._bbs2chService.BOARD_TYPE_BE2CH: + case this._bbs2chService.BOARD_TYPE_JBBS: charset = "EUC-JP"; break; } @@ -284,34 +298,83 @@ }, post: function(aListener, additionalData){ this.listener = aListener; - // DAT ID - this.threadURI.spec.match(/\/(\d{9,10})/); - var datID = RegExp.$1; - // カテゴリ - this.boardURI.spec.match(/\/([^\/]+)\/?$/); - var category = RegExp.$1; - // POST データ - var postSubmit = "\u66F8\u304D\u8FBC\u3080"; - postSubmit = "submit=" + this._escape(postSubmit); - var postBbs = "bbs=" + category; - var postKey = "key=" + datID; - var postTime = "time=" + this.getLastModified(); + switch(this.type){ + case this._bbs2chService.BOARD_TYPE_2CH: + case this._bbs2chService.BOARD_TYPE_BE2CH: + // DAT ID + this.threadURI.spec.match(/\/(\d{9,10})/); + var datID = RegExp.$1; + // カテゴリ + this.boardURI.spec.match(/\/([^\/]+)\/?$/); + var category = RegExp.$1; + // POST データ + var postSubmit = "\u66F8\u304D\u8FBC\u3080"; + postSubmit = "submit=" + this._escape(postSubmit); - var postMsg = "MESSAGE=" + this._escape(this.message); - var postName = "FROM=" + this._escape(this.name); - var postMail = "mail=" + this._escape(this.mail); - var postHana = "hana=mogera"; + var postBbs = "bbs=" + category; + var postKey = "key=" + datID; + var postTime = "time=" + this.getLastModified(); - var postData = new Array(postSubmit, postBbs, postKey, postTime, - postMsg, postName, postMail, postHana); - if(additionalData){ - postData = postData.concat(additionalData); - } + var postMsg = "MESSAGE=" + this._escape(this.message); + var postName = "FROM=" + this._escape(this.name); + var postMail = "mail=" + this._escape(this.mail); + var postHana = "hana=mogera"; - if(this._bbs2chService.maruLogined){ - var sid = "sid=" + encodeURIComponent(this._bbs2chService.maruSessionID); - postData.push(sid); + var postData = new Array(postSubmit, postBbs, postKey, postTime, + postMsg, postName, postMail, postHana); + if(additionalData){ + postData = postData.concat(additionalData); + } + + if(this._bbs2chService.maruLogined){ + var sid = "sid=" + encodeURIComponent(this._bbs2chService.maruSessionID); + postData.push(sid); + } + break; + case this._bbs2chService.BOARD_TYPE_JBBS: + // DAT ID + this.threadURI.spec.match(/\/(\d{9,10})/); + var datID = RegExp.$1; + // カテゴリ + this.boardURI.spec.match(/\/([^\/]+)\/([^\/]+)\/?$/); + var directory = RegExp.$1; + var category = RegExp.$2; + // POST データ + var postSubmit = "\u66F8\u304D\u8FBC\u3080"; + postSubmit = "submit=" + this._escape(postSubmit); + + var postDir = "DIR=" + directory; + var postBbs = "BBS=" + category; + var postKey = "KEY=" + datID; + var postTime = "TIME=1"; + + var postMsg = "MESSAGE=" + this._escape(this.message); + var postName = "NAME=" + this._escape(this.name); + var postMail = "MAIL=" + this._escape(this.mail); + + var postData = new Array(postSubmit, postDir, postBbs, postKey, + postTime,postMsg, postName, postMail); + break; + case this._bbs2chService.BOARD_TYPE_MACHI: + // DAT ID + this.threadURI.spec.match(/\/(\d{9,10})/); + var datID = RegExp.$1; + // カテゴリ + this.boardURI.spec.match(/\/([^\/]+)\/?$/); + var category = RegExp.$1; + // POST データ + var postSubmit = "\u66F8\u304D\u8FBC\u307F"; + postSubmit = "submit=" + this._escape(postSubmit); + var postName = "NAME=" + this._escape(this.name); + var postMail = "MAIL=" + this._escape(this.mail); + var postMsg = "MESSAGE=" + this._escape(this.message); + var postBbs = "BBS=" + category; + var postKey = "KEY=" + datID; + var postTime = "TIME=1"; + + var postData = [postSubmit, postName, postMail, postMsg, postBbs, postKey, postTime]; + break; } var httpReqest = new Bbs2chHttpRequest(this._postURI.spec, aListener, this.threadURI.spec); @@ -323,7 +386,7 @@ SAMBA: 3, ERROR: 4, UNKNOWN: 5, - getStatus:function(aResponse){ + getStatus:function(aResponse, aStatus){ //書きこみました,書き込みました,書き込み終了,書きこみが終わりました const SUCCESS = new Array("\u66F8\u304D\u3053\u307F\u307E\u3057\u305F","\u66F8\u304D\u8FBC\u307F\u307E\u3057\u305F","\u66F8\u304D\u8FBC\u307F\u7D42\u4E86","\u66F8\u304D\u3053\u307F\u304C\u7D42\u308F\u308A\u307E\u3057\u305F"); //クッキー確認 @@ -334,6 +397,10 @@ const CHECK_SAMBA = new Array("Samba","SAMBA","samba"); //ERROR,ERROR const CHECK_ERROR = new Array("ERROR","\uFF25\uFF32\uFF32\uFF2F\uFF32"); + + if(this.type == this._bbs2chService.BOARD_TYPE_MACHI && aStatus == 302) + return this.SUCCESS; + for(var i in SUCCESS){ if(aResponse.match(SUCCESS[i])){ return this.SUCCESS; From svnnotify @ sourceforge.jp Wed Sep 17 00:26:30 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 17 Sep 2008 00:26:30 +0900 Subject: [Bbs2ch-cvs 460] [442] [04_BRANCH] ver 0.4.16 Message-ID: <1221578790.005537.5770.nullmailer@users.sourceforge.jp> Revision: 442 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=442 Author: flyson Date: 2008-09-17 00:26:29 +0900 (Wed, 17 Sep 2008) Log Message: ----------- [04_BRANCH] ver 0.4.16 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/install.rdf -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/install.rdf =================================================================== --- branches/bbs2chreader/04_BRANCH/install.rdf 2008-09-16 15:25:49 UTC (rev 441) +++ branches/bbs2chreader/04_BRANCH/install.rdf 2008-09-16 15:26:29 UTC (rev 442) @@ -4,7 +4,7 @@ Revision: 443 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=443 Author: flyson Date: 2008-09-19 23:46:45 +0900 (Fri, 19 Sep 2008) Log Message: ----------- [04_BRANCH] ????帥??c???????絎???ゃ????????ゃ????罩c????? Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/settings/general-pane.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/settings/general-pane.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/settings/general-pane.js 2008-09-16 15:26:29 UTC (rev 442) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/settings/general-pane.js 2008-09-19 14:46:45 UTC (rev 443) @@ -1,88 +1,88 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is bbs2chreader. - * - * The Initial Developer of the Original Code is - * flyson. - * Portions created by the Initial Developer are Copyright (C) 2004 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * flyson - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - -var gGeneralPane = { - startup: function(){ - setCcontainerDisabled("extensions.bbs2chreader.enable_browser_contextmenu", - "boxDisregardURLOption", true); - setCcontainerDisabled("extensions.bbs2chreader.appoint_data_dir", - "boxDataDir", true); - setCcontainerDisabled("extensions.bbs2chreader.http_proxy_mode", - "txtProxyValue", "2"); - setCcontainerDisabled("extensions.bbs2chreader.thread_redirector.enabled", - "boxRedirectorAsk", true); - }, - - selectDataDir: function(){ - const nsIFilePicker = Components.interfaces.nsIFilePicker; - - var dataDirPref = document.getElementById("extensions.bbs2chreader.data_dir"); - - var filePicker = Components.classes["@mozilla.org/filepicker;1"] - .createInstance(nsIFilePicker); - filePicker.init(window, "title", nsIFilePicker.modeGetFolder); - - // ??\ヲ???? - var displayDirectory = Components.classes["@mozilla.org/file/local;1"] - .createInstance(Components.interfaces.nsILocalFile); - try{ - displayDirectory.initWithPath(dataDirPref.value); - if(displayDirectory.exists()){ - filePicker.displayDirectory = displayDirectory; - } - }catch(ex){} - - if (filePicker.show() != nsIFilePicker.returnOK) return; - - var selectedDir = filePicker.file - .QueryInterface(Components.interfaces.nsILocalFile); - dataDirPref.value = selectedDir.path; - }, - - readDataDirPref: function(){ - var dataDirPref = document.getElementById("extensions.bbs2chreader.data_dir"); - var txtDataDir = document.getElementById("txtDataDir"); - if(!dataDirPref.value) return ""; - return dataDirPref.value; - }, - - openMaruDialog: function(){ - document.documentElement.openSubDialog( - "chrome://bbs2chreader/content/settings/maru.xul", "", null); - } +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is bbs2chreader. + * + * The Initial Developer of the Original Code is + * flyson. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * flyson + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + + +var gGeneralPane = { + startup: function(){ + setCcontainerDisabled("extensions.bbs2chreader.enable_browser_contextmenu", + "boxDisregardURLOption", true); + setCcontainerDisabled("extensions.bbs2chreader.appoint_data_dir", + "boxDataDir", true); + setCcontainerDisabled("extensions.bbs2chreader.http_proxy_mode", + "txtProxyValue", "2"); + setCcontainerDisabled("extensions.bbs2chreader.thread_redirector.enabled", + "boxRedirectorAsk", true); + }, + + selectDataDir: function(){ + const nsIFilePicker = Components.interfaces.nsIFilePicker; + + var dataDirPref = document.getElementById("extensions.bbs2chreader.data_dir"); + + var filePicker = Components.classes["@mozilla.org/filepicker;1"] + .createInstance(nsIFilePicker); + filePicker.init(window, "????????????????????, nsIFilePicker.modeGetFolder); + + // ???茵?ず?????? + var displayDirectory = Components.classes["@mozilla.org/file/local;1"] + .createInstance(Components.interfaces.nsILocalFile); + try{ + displayDirectory.initWithPath(dataDirPref.value); + if(displayDirectory.exists()){ + filePicker.displayDirectory = displayDirectory; + } + }catch(ex){} + + if (filePicker.show() != nsIFilePicker.returnOK) return; + + var selectedDir = filePicker.file + .QueryInterface(Components.interfaces.nsILocalFile); + dataDirPref.value = selectedDir.path; + }, + + readDataDirPref: function(){ + var dataDirPref = document.getElementById("extensions.bbs2chreader.data_dir"); + var txtDataDir = document.getElementById("txtDataDir"); + if(!dataDirPref.value) return ""; + return dataDirPref.value; + }, + + openMaruDialog: function(){ + document.documentElement.openSubDialog( + "chrome://bbs2chreader/content/settings/maru.xul", "", null); + } }; \ No newline at end of file From svnnotify @ sourceforge.jp Fri Sep 19 23:49:26 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 19 Sep 2008 23:49:26 +0900 Subject: [Bbs2ch-cvs 462] =?utf-8?b?WzQ0NF0gWzA0X0JSQU5DSF0gIOOCueOCreODs+OBruiqreOBvw==?= =?utf-8?b?6L6844G/5aSx5pWX5pmC44Gu5Zue5b6p44GM5q2j44GX44GP5YuV5L2c44GX?= =?utf-8?b?44Gm44GE44Gq44GL44Gj44Gf44Gu44KS5L+u5q2j?= Message-ID: <1221835766.666971.18838.nullmailer@users.sourceforge.jp> Revision: 444 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=444 Author: flyson Date: 2008-09-19 23:49:26 +0900 (Fri, 19 Sep 2008) Log Message: ----------- [04_BRANCH] ?鴻??潟?茯??莨若?紊掩??????奨???????????????????????信罩? Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js 2008-09-19 14:46:45 UTC (rev 443) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js 2008-09-19 14:49:26 UTC (rev 444) @@ -132,7 +132,7 @@ try{ this.converter.init(this, this.dat.threadURL, this.dat.boardURL, this.dat.type); }catch(ex){ - if(ex.result == Components.results.NS_ERROR_FILE_NOT_FOUND){ + if(ex == Components.results.NS_ERROR_FILE_NOT_FOUND){ var skinName = this._bbs2chService.pref.getComplexValue( "extensions.bbs2chreader.thread_skin", Components.interfaces.nsISupportsString).data; @@ -1060,25 +1060,16 @@ this._dd2Color = new b2rId2Color(); this._dd2Color.init(); - - var skinURISpec = "chrome://bbs2chreader/content/res/skin-default/"; - var skinName = this._bbs2chService.pref.getComplexValue( - "extensions.bbs2chreader.thread_skin", - Components.interfaces.nsISupportsString).data; - if(skinName != ""){ - var skinDir = this._bbs2chService.getDataDir(); - skinDir.appendRelativePath("skin"); - var fileURL = this._ioService.newFileURI(skinDir) - .QueryInterface(Components.interfaces.nsIFileURL); - skinURISpec = fileURL.resolve(encodeURIComponent(skinName)) + "/"; - } - this._tmpHeader = this._bbs2chService.readFile(this._resolveSkinFile("Header.html").path); this._tmpFooter = this._bbs2chService.readFile(this._resolveSkinFile("Footer.html").path); this._tmpRes = this._bbs2chService.readFile(this._resolveSkinFile("Res.html").path); this._tmpNewRes = this._bbs2chService.readFile(this._resolveSkinFile("NewRes.html").path); this._tmpNewMark = this._bbs2chService.readFile(this._resolveSkinFile("NewMark.html").path); + if(this._tmpHeader===null || this._tmpFooter===null || this._tmpRes===null || this._tmpNewRes===null || this._tmpNewMark===null){ + throw Components.results.NS_ERROR_FILE_NOT_FOUND + } + // ?????????? this._tmpHeader = this._replaceBaseTag(this._tmpHeader); this._tmpFooter = this._replaceBaseTag(this._tmpFooter); From svnnotify @ sourceforge.jp Sat Sep 20 01:54:48 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 20 Sep 2008 01:54:48 +0900 Subject: [Bbs2ch-cvs 463] =?utf-8?b?WzQ0NV0gWzA0X0JSQU5DSF0gIEZ4MiDjgavlr77lv5zjgZXjgZs=?= =?utf-8?b?44KL44Gf44KB44Od44OD44OX44Ki44OD44OX44Gu6IOM5pmv44KS55S75YOP?= =?utf-8?b?44Gr5oi744GX44Gf?= Message-ID: <1221843288.719348.24314.nullmailer@users.sourceforge.jp> Revision: 445 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=445 Author: flyson Date: 2008-09-20 01:54:48 +0900 (Sat, 20 Sep 2008) Log Message: ----------- [04_BRANCH] Fx2 ???綽????????????????????????糸??????? Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/defaults/skin/style.css -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/defaults/skin/style.css =================================================================== --- branches/bbs2chreader/04_BRANCH/defaults/skin/style.css 2008-09-19 14:49:26 UTC (rev 444) +++ branches/bbs2chreader/04_BRANCH/defaults/skin/style.css 2008-09-19 16:54:48 UTC (rev 445) @@ -49,7 +49,7 @@ #navMenu ul{ padding: 0px; margin: 0px; - background-color: rgba(60, 60, 60, 0.85); + background: transparent url('popup-back.png'); } #navMenu li{ @@ -130,8 +130,9 @@ /* ***** ***** ?????? ***** ***** */ div.popup { padding: 10px; - -moz-border-radius: 8px; - background-color: rgba(60, 60, 60, 0.85); + -moz-outline: 2px solid #555; + -moz-outline-radius: 8px; + background: transparent url('popup-back.png'); color: #F6F6F6; position: absolute; font-size: 0.8em; @@ -143,7 +144,7 @@ div.imagePopup { padding: 0px; border: 1px solid #555; - background-color: rgba(60, 60, 60, 0.85); + background: transparent url('popup-back.png'); position: absolute; left: -1000px; top: -1000px; From svnnotify @ sourceforge.jp Sat Sep 20 01:57:36 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 20 Sep 2008 01:57:36 +0900 Subject: [Bbs2ch-cvs 464] =?utf-8?b?WzQ0Nl0gWzA0X0JSQU5DSF0gIFN0YWdlNiDjgrXjg53jg7zjg4g=?= =?utf-8?b?5YGc5q2i?= Message-ID: <1221843456.963394.26550.nullmailer@users.sourceforge.jp> Revision: 446 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=446 Author: flyson Date: 2008-09-20 01:57:36 +0900 (Sat, 20 Sep 2008) Log Message: ----------- [04_BRANCH] Stage6 サポート停止 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/defaults/skin/popup.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/defaults/skin/popup.js =================================================================== --- branches/bbs2chreader/04_BRANCH/defaults/skin/popup.js 2008-09-19 16:54:48 UTC (rev 445) +++ branches/bbs2chreader/04_BRANCH/defaults/skin/popup.js 2008-09-19 16:57:36 UTC (rev 446) @@ -271,10 +271,7 @@ init: function(){ var xpathYoutube = "descendant::a[@class='outLink'][contains(@href, '.youtube.com/watch')]"; - var xpathStage6 = "descendant::a[@class='outLink'][contains(@href, 'http://stage6.divx.com/content/show')]"; - var xpathStage6m = "descendant::a[@class='outLink'][contains(@href, 'http://stage6.divx.com/members')]"; - var xpathStage6c = "descendant::a[@class='outLink'][contains(@href, 'http://stage6.client.jp/#')]"; - var xpath = xpathYoutube +"|"+ xpathStage6 +"|"+ xpathStage6m +"|"+ xpathStage6c; + var xpath = xpathYoutube; for(let [index, node] in b2rPopup.xpathEvaluate(xpath)){ node.setAttribute("onmouseover", "b2rPopup.videoPopup.mouseOver(event)"); @@ -291,12 +288,6 @@ var content; if(url.indexOf(".youtube.com")!=-1 && url.match(/v=([^\&]+)/)){ content = b2rPopup.videoPopup.createYoutubeContent(RegExp.$1); - }else if(url.indexOf("stage6.divx.com")!=-1 && url.match(/content_id=([^\&]+)/)){ - content = b2rPopup.videoPopup.createStage6Content(RegExp.$1); - }else if(url.indexOf("stage6.divx.com")!=-1 && url.match(/videos\/([^\&]+)/)){ - content = b2rPopup.videoPopup.createStage6Content(RegExp.$1); - }else if(url.indexOf("http://stage6.client.jp/#")!=-1 && url.match(/\/#([^\&]+)/)){ - content = b2rPopup.videoPopup.createStage6Content(RegExp.$1); } if(content){ @@ -313,22 +304,6 @@ videoObject.setAttribute("width", "320"); videoObject.setAttribute("height", "260"); return videoObject; - }, - - - createStage6Content: function(aVideoID){ - var url = "http://stage6.divx.com/content/show?content_id=" + aVideoID + ".divx"; - var thumbnailURL = "http://images.stage6.com/videos/" + aVideoID + ".jpg"; - - var link = document.createElement("a"); - link.setAttribute("href", url); - link.setAttribute("target", "_blank"); - var image = document.createElement("img"); - image.setAttribute("src", thumbnailURL); - image.style.width = "320px"; - image.style.borderStyle = "none"; - link.appendChild(image); - return link; } }; \ No newline at end of file From svnnotify @ sourceforge.jp Mon Sep 22 21:51:29 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Sep 2008 21:51:29 +0900 Subject: [Bbs2ch-cvs 465] =?utf-8?b?WzQ0N10gWzA0X0JSQU5DSF0gIOWkieaVsOWQjeOAgHN1cGVyIA==?= =?utf-8?b?44GM5LqI57SE6Kqe44Gu44Gf44KB5ZCN56ew5aSJ5pu0?= Message-ID: <1222087889.335786.25064.nullmailer@users.sourceforge.jp> Revision: 447 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=447 Author: flyson Date: 2008-09-22 21:51:29 +0900 (Mon, 22 Sep 2008) Log Message: ----------- [04_BRANCH] 変数名 super が予約語のため名称変更 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js =================================================================== --- branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js 2008-09-19 16:57:36 UTC (rev 446) +++ branches/bbs2chreader/04_BRANCH/chrome/content/bbs2chreader/server/thread.js 2008-09-22 12:51:29 UTC (rev 447) @@ -764,8 +764,8 @@ datLineParse: function(aLine, aNumber, aNew){ var resArray = aLine.split("<>"); var trueNumber = parseInt(resArray.shift()); - var super = b2rThread2ch.prototype.datLineParse; - return super.apply(this, [resArray.join("<>"), trueNumber, aNew]); + var superClass = b2rThread2ch.prototype.datLineParse; + return superClass.apply(this, [resArray.join("<>"), trueNumber, aNew]); }, @@ -778,8 +778,8 @@ if(!lastLine) lastLine = lines.pop(); this.dat.lineCount = parseInt(lastLine.match(/^\d+/)); } - var super = b2rThread2ch.prototype.datSave; - return super.apply(this, arguments); + var superClass = b2rThread2ch.prototype.datSave; + return superClass.apply(this, arguments); } }; From svnnotify @ sourceforge.jp Mon Sep 22 21:52:32 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Sep 2008 21:52:32 +0900 Subject: [Bbs2ch-cvs 466] =?utf-8?b?WzQ0OF0gWzA0X0JSQU5DSF0gIEZ4MiDlr77lv5w=?= Message-ID: <1222087952.110678.26358.nullmailer@users.sourceforge.jp> Revision: 448 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=448 Author: flyson Date: 2008-09-22 21:52:31 +0900 (Mon, 22 Sep 2008) Log Message: ----------- [04_BRANCH] Fx2 対応 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/components/b2rServer.js -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/components/b2rServer.js =================================================================== --- branches/bbs2chreader/04_BRANCH/components/b2rServer.js 2008-09-22 12:51:29 UTC (rev 447) +++ branches/bbs2chreader/04_BRANCH/components/b2rServer.js 2008-09-22 12:52:31 UTC (rev 448) @@ -91,7 +91,7 @@ this._statusCode["s406"] = "406 Not Acceptable"; this._statusCode["s407"] = "407 Proxy Authentication Required"; this._statusCode["s408"] = "408 Request Timeout"; - this._statusCode["s403"] = "409 Conflict"; + this._statusCode["s409"] = "409 Conflict"; this._statusCode["s410"] = "410 Gone"; this._statusCode["s411"] = "411 Length Required"; this._statusCode["s412"] = "412 Precondition Failed"; @@ -275,9 +275,20 @@ this._getData = new Array(); this._requestBuffer = ""; - this._input.asyncWait(this, 0, 0, Cc["@mozilla.org/thread-manager;1"].getService().mainThread); + this._input.asyncWait(this, 0, 0, this._getMainThread()); }, + _getMainThread: function(){ + if ("@mozilla.org/thread-manager;1" in Components.classes) { + // Firefox 3 + return Cc["@mozilla.org/thread-manager;1"].getService().mainThread; + } else { + // Firefox 2 + var eventQueueService = XPC.getService("@mozilla.org/event-queue-service;1", "nsIEventQueueService"); + return eventQueueService.getSpecialEventQueue(Ci.nsIEventQueueService.UI_THREAD_EVENT_QUEUE); + } + }, + onInputStreamReady: function(aInput){ var available = aInput.available(); var bInputStream = XPC.createInstance("@mozilla.org/binaryinputstream;1", "nsIBinaryInputStream"); @@ -286,7 +297,7 @@ if((/\r\n\r\n/).test(this._requestBuffer)){ this._parseRequestData(); }else{ - this._input.asyncWait(this, 0, 0, Cc["@mozilla.org/thread-manager;1"].getService().mainThread); + this._input.asyncWait(this, 0, 0, this._getMainThread()); } }, From svnnotify @ sourceforge.jp Mon Sep 22 22:00:51 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Sep 2008 22:00:51 +0900 Subject: [Bbs2ch-cvs 467] [449] [04_BRANCH] ver 0.4.17 Message-ID: <1222088451.448694.32363.nullmailer@users.sourceforge.jp> Revision: 449 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=449 Author: flyson Date: 2008-09-22 22:00:51 +0900 (Mon, 22 Sep 2008) Log Message: ----------- [04_BRANCH] ver 0.4.17 Modified Paths: -------------- branches/bbs2chreader/04_BRANCH/install.rdf -------------- next part -------------- Modified: branches/bbs2chreader/04_BRANCH/install.rdf =================================================================== --- branches/bbs2chreader/04_BRANCH/install.rdf 2008-09-22 12:52:31 UTC (rev 448) +++ branches/bbs2chreader/04_BRANCH/install.rdf 2008-09-22 13:00:51 UTC (rev 449) @@ -4,7 +4,7 @@ + em:minVersion="2.0" em:maxVersion="3.0.*"/> \ No newline at end of file