svnno****@sourc*****
svnno****@sourc*****
2008年 9月 19日 (金) 23:49:26 JST
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
+ }
+
// Šî–{ƒXƒLƒ“ƒ^ƒO‚Ì’uŠ·
this._tmpHeader = this._replaceBaseTag(this._tmpHeader);
this._tmpFooter = this._replaceBaseTag(this._tmpFooter);