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 @@
-
-
+
+
+