Bump version to v3.1.2

Add adjusting to osapi.dmm.com, update plugin.
poooi · Aug 5, 2015 · 94bfc4a · 94bfc4a
1 parent ebe2530
commit 94bfc4a
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 22 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "poi",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "homepage": "https://github.com/poooi/poi",
   "authors": [
     "Magica <[email protected]>"

diff --git a/gulpfile.coffee b/gulpfile.coffee
@@ -1,4 +1,4 @@
-POI_VERSION = '3.1.1'
+POI_VERSION = '3.1.2'
 ELECTRON_VERSION = '0.30.0'
 SYSTEM_BIT =
   win32: 'ia32'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "poi",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "KanColle Browser Tool",
   "main": "index.js",
   "scripts": {

diff --git a/plugins/prophet b/plugins/prophet
diff --git a/views/layout.horizonal.cjsx b/views/layout.horizonal.cjsx
@@ -22,21 +22,31 @@ adjustSize = ->
     $('kan-game')?.style?.display = 'none'
   else
     $('kan-game')?.style?.display = ''
-  if url != 'http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/'
+  if url != 'http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/' and !(url?.startsWith('http://osapi.dmm.com/gadgets/ifr'))
     $('kan-game #webview-wrapper')?.style?.height = $('kan-game webview')?.style?.height = $('kan-game webview /deep/ object[is=browserplugin]')?.style?.height = "#{window.innerHeight - 31}px"
     return
   factor = Math.ceil(window.innerWidth * (if window.doubleTabbed then 4.0 / 7.0 else 5.0 / 7.0) / 800.0 * 100) / 100.0
   if webviewWidth > 0.00001
     factor = Math.ceil(webviewWidth / 800.0 * 100) / 100.0
   webview.executeJavaScript """
-    var iframe = document.querySelector('#game_frame').contentWindow.document;
-    document.querySelector('html').style.zoom = #{factor};
-    iframe.querySelector('html').style.zoom = #{factor};
-    window.scrollTo(0, 0);
-    var x = document.querySelector('#game_frame').getBoundingClientRect().left + iframe.querySelector('embed').getBoundingClientRect().left;
-    var y = document.querySelector('#game_frame').getBoundingClientRect().top + iframe.querySelector('embed').getBoundingClientRect().top;
-    window.scrollTo(Math.ceil(x * #{factor}), Math.ceil(y * #{factor}));
-    document.documentElement.style.overflow = 'hidden';
+    if (document.querySelector('#game_frame') != null) {
+      var iframe = document.querySelector('#game_frame').contentWindow.document;
+      document.querySelector('html').style.zoom = #{factor};
+      iframe.querySelector('html').style.zoom = #{factor};
+      window.scrollTo(0, 0);
+      var x = document.querySelector('#game_frame').getBoundingClientRect().left + iframe.querySelector('embed').getBoundingClientRect().left;
+      var y = document.querySelector('#game_frame').getBoundingClientRect().top + iframe.querySelector('embed').getBoundingClientRect().top;
+      window.scrollTo(Math.ceil(x * #{factor}), Math.ceil(y * #{factor}));
+      document.documentElement.style.overflow = 'hidden';
+    } else if (document.querySelector('embed') != null) {
+      var iframe = document.querySelector('embed');
+      document.querySelector('html').style.zoom = #{factor};
+      window.scrollTo(0, 0);
+      var x = document.querySelector('embed').getBoundingClientRect().left;
+      var y = document.querySelector('embed').getBoundingClientRect().top;
+      window.scrollTo(Math.ceil(x * #{factor}), Math.ceil(y * #{factor}));
+      document.documentElement.style.overflow = 'hidden';
+    }
   """
   $('kan-game #webview-wrapper')?.style?.height = $('kan-game webview')?.style?.height = $('kan-game webview /deep/ object[is=browserplugin]')?.style?.height = "#{Math.floor(480 * factor) - 1}px"
   $('kan-game').style.marginTop = "#{Math.max(0, (window.innerHeight - Math.floor(480 * factor - 1) - 30)) / 2.0}px"

diff --git a/views/layout.vertical.cjsx b/views/layout.vertical.cjsx
@@ -21,16 +21,26 @@ adjustSize = ->
   $('kan-game #webview-wrapper')?.style?.height = $('kan-game webview')?.style?.height = $('kan-game webview /deep/ object[is=browserplugin]')?.style?.height = "#{480.0 * factor - 1}px"
   $('kan-game #webview-wrapper')?.style?.width = "#{800 * factor}px"
   $('kan-game #webview-wrapper')?.style?.marginLeft = "#{Math.max(0, window.innerWidth - 800 * factor - 1) / 2}px"
-  return if url != 'http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/'
+  return if url != 'http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/' and !(url?.startsWith('http://osapi.dmm.com/gadgets/ifr'))
   webview.executeJavaScript """
-    var iframe = document.querySelector('#game_frame').contentWindow.document;
-    document.querySelector('html').style.zoom = #{factor};
-    iframe.querySelector('html').style.zoom = #{factor};
-    window.scrollTo(0, 0);
-    var x = document.querySelector('#game_frame').getBoundingClientRect().left + iframe.querySelector('embed').getBoundingClientRect().left;
-    var y = document.querySelector('#game_frame').getBoundingClientRect().top + iframe.querySelector('embed').getBoundingClientRect().top;
-    window.scrollTo(Math.ceil(x * #{factor}), Math.ceil(y * #{factor}));
-    document.documentElement.style.overflow = 'hidden';
+    if (document.querySelector('#game_frame') != null) {
+      var iframe = document.querySelector('#game_frame').contentWindow.document;
+      document.querySelector('html').style.zoom = #{factor};
+      iframe.querySelector('html').style.zoom = #{factor};
+      window.scrollTo(0, 0);
+      var x = document.querySelector('#game_frame').getBoundingClientRect().left + iframe.querySelector('embed').getBoundingClientRect().left;
+      var y = document.querySelector('#game_frame').getBoundingClientRect().top + iframe.querySelector('embed').getBoundingClientRect().top;
+      window.scrollTo(Math.ceil(x * #{factor}), Math.ceil(y * #{factor}));
+      document.documentElement.style.overflow = 'hidden';
+    } else if (document.querySelector('embed') != null) {
+      var iframe = document.querySelector('embed');
+      document.querySelector('html').style.zoom = #{factor};
+      window.scrollTo(0, 0);
+      var x = document.querySelector('embed').getBoundingClientRect().left;
+      var y = document.querySelector('embed').getBoundingClientRect().top;
+      window.scrollTo(Math.ceil(x * #{factor}), Math.ceil(y * #{factor}));
+      document.documentElement.style.overflow = 'hidden';
+    }
   """
 # interval = setInterval adjustSize, 500
 if !window._delay