Skip to content

Commit 4c808b0

Browse files
committed
Fixed useragent list.
Fixed video function. Fixed url function.
1 parent fe37fbe commit 4c808b0

7 files changed

Lines changed: 35 additions & 23 deletions

File tree

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.29.0
1+
0.29.1

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sushi-browser",
3-
"version": "0.29.0",
3+
"version": "0.29.1",
44
"description": "Sushi Browser",
55
"main": "./lib/main.js",
66
"author": "kura52",

src/defaultExtension/bg.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -548,23 +548,11 @@ const cache = new LRUCache(5000)
548548
chrome.webRequest.onHeadersReceived.addListener((details)=>{
549549
const headers = details.responseHeaders, newURL = details.url
550550

551-
console.log('url', details.url, details)
551+
// console.log('url', details.url, details)
552552
const contType = headers.find(x=>x.name == 'Content-Type' || x.name == 'content-type' || x.name == 'CONTENT-TYPE')
553553
if(!contType) return
554-
// console.log(contType[0])
555554

556555
const matchNormal = contType && contType.value.match(RegNormal)
557-
// if(!matchNormal && ((contType && contType[0].match(RegForDL)) || newURL.match(RegForDLExt))){
558-
// console.log(6755,contType && contType[0],newURL,tab.getURL())
559-
// const url = details.firstPartyUrl
560-
// const map = cache.get(url)
561-
// if(map){
562-
// map[newURL] = contType && contType[0]
563-
// }
564-
// else{
565-
// cache.set(url,{[newURL]:contType && contType[0]})
566-
// }
567-
// }
568556

569557
const urlMatch = newURL.match(regVideoSuffix)
570558
if((!contType || matchNormal || contType.value.startsWith('image')) && !urlMatch) return

src/render/split_pane/SplitPane.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,20 @@ class SplitPane extends Component {
225225
}).find(x=>x)
226226
}
227227

228-
onResize(event){
228+
async onResize(event){
229229
console.log("eve",event)
230230
if(!event.old_w && !this.w){
231-
const maxBounds = JSON.parse(ipc.sendSync('get-sync-main-state','maxState'))
231+
let maxBounds
232+
if(ipc.sendSync){
233+
maxBounds = JSON.parse(ipc.sendSync('get-sync-main-state','maxState'))
234+
}
235+
else{
236+
maxBounds = await new Promise(r=>{
237+
const key = Math.random().toString()
238+
ipc.send('get-sync-main-states',['maxState'],key)
239+
ipc.once(`get-sync-main-states-reply_${key}`, (e,result) => r(result[0]))
240+
})
241+
}
232242
event.old_w = maxBounds.maximize ? maxBounds.maxWidth : maxBounds.width
233243
event.old_h = maxBounds.maximize ? maxBounds.maxHeight : maxBounds.height
234244
}

src/toolPages/puppeteer/NetworkManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class Response {
139139
this._contentPromise = null;
140140

141141
this._status = details.statusCode;
142-
this._url = request.url();
142+
this._url = details.url;
143143
this._fromDiskCache = details.fromCache;
144144
this._headers = {};
145145
for (let h of details.responseHeaders){

tools/versionUp.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,19 @@ const CURRENT_APP_VERSION = fs.readFileSync('../VERSION.txt').toString()
3535
const NEXT_APP_VERSION = "0.29.1"
3636
const NEXT_APP_VERSION2 = `${NEXT_APP_VERSION.split(".").slice(0,-1).join('.')}${NEXT_APP_VERSION.split(".").slice(-1)[0]}`
3737

38-
const CHANGE_ENGLISH =``
38+
const CHANGE_ENGLISH =`Fixed a bug of moving video / window when maximizing.
39+
Fixed a bug in the z-order of the window.
40+
Fixed a bug in the function displayed in the foreground.
41+
Fixed a bug of closing pop-up window.
42+
Fixed a bug in the display position of the toolbar menu.
43+
Fixed a bug of adding / deleting bookmarks.
44+
Fixed a bug in File Explorer.
45+
Fixed download function.
46+
Fixed video download.
47+
Fixed a bug in video playback.
48+
Fixed location bar bug.
49+
Updated UserAgent list.
50+
Fixed Other bugs.`
3951

4052
const CHANGE_JAPANESE = `最大化時の動画/ウインドウ移動の不具合を修正。
4153
ウインドウのz-orderの不具合を修正。
@@ -49,7 +61,7 @@ const CHANGE_JAPANESE = `最大化時の動画/ウインドウ移動の不具合
4961
動画再生の不具合を修正。
5062
ロケーションバーの不具合修正。
5163
UserAgentリストを更新。
52-
`
64+
その他不具合の修正`
5365

5466
const isWindows = process.platform === 'win32'
5567
const isDarwin = process.platform === 'darwin'

webpack.config.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,13 @@ module.exports = [
133133
// merge({fileName:"settings.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),
134134

135135
// merge({fileName:"converter.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),
136-
// merge({fileName:"automation.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),
136+
merge({fileName:"automation.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),
137137
// merge({fileName:"inputHistorySetting.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),
138138
// merge({fileName:"macro.js",src:path.join(__dirname,"./src/defaultExtension/"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfigExt),
139139
// merge({fileName:"mobilePanel.js",src:path.join(__dirname,"./src/defaultExtension/"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfigExt),
140-
merge({fileName:"contentscript.js",src:path.join(__dirname,"./src/defaultExtension/"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfigExt),
141-
// merge({fileName:"bg.js",src:path.join(__dirname,"./src/defaultExtension/"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfigExt),
140+
merge({fileName:"videoPlayer.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),
141+
142+
// merge({fileName:"contentscript.js",src:path.join(__dirname,"./src/defaultExtension/"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfigExt),
143+
merge({fileName:"bg.js",src:path.join(__dirname,"./src/defaultExtension/"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfigExt),
142144
]
143145

0 commit comments

Comments
 (0)