Merge branch 'comm-filter-plugin/release/v0.5.2' into comm-filter-plugin/develop

# Conflicts:
#	built/comm-filter.meta.js
#	built/comm-filter.user.js

Author: udnp

README.ja

@@ -71,6 +71,11 @@
      独自ビルドの IITC Mobile(version 0.25.1 ベース) 
 
 *** リリース履歴
+**** v0.5.2
+     Android の画面サイズが小さいデバイスでは依然としてチェックボックス項目が水平方向にはみ出す問題に対応し，
+     チェックボックス項目の領域を左右にスライドさせることで全てのチェックボックス項目を表示できるようにしました．
+     https://github.com/udnp/iitc-plugins/issues/7
+     
 **** v0.5.1
      Android 版でチェックボックス項目が水平方向にはみ出す場合がある問題を修正し、
      テキストボックスを click/tap した際に幅を広げチェックボックスを非表示にするようにしました。

built/comm-filter.meta.js

@@ -3,12 +3,12 @@
 // @name           IITC plugin: COMM Filter
 // @author         udnp
 // @category       COMM
-// @version        0.5.2.20160406.102111
+// @version        0.5.2.20160411.123020
 // @namespace      https://github.com/jonatkins/ingress-intel-total-conversion
 // @source         https://github.com/udnp/iitc-plugins
-// @updateURL      https://github.com/udnp/iitc-plugins/raw/comm-filter-plugin/develop/built/comm-filter.meta.js
-// @downloadURL    https://github.com/udnp/iitc-plugins/raw/comm-filter-plugin/develop/built/comm-filter.user.js
-// @description    [udnp-2016-04-06-102111] COMM Filter
+// @updateURL      https://github.com/udnp/iitc-plugins/raw/master/built/comm-filter.meta.js
+// @downloadURL    https://github.com/udnp/iitc-plugins/raw/master/built/comm-filter.user.js
+// @description    [udnp-2016-04-11-123020] COMM Filter
 // @include        https://www.ingress.com/intel*
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*

built/comm-filter.user.js

@@ -3,12 +3,12 @@
 // @name           IITC plugin: COMM Filter
 // @author         udnp
 // @category       COMM
-// @version        0.5.2.20160406.102111
+// @version        0.5.2.20160411.123020
 // @namespace      https://github.com/jonatkins/ingress-intel-total-conversion
 // @source         https://github.com/udnp/iitc-plugins
-// @updateURL      https://github.com/udnp/iitc-plugins/raw/comm-filter-plugin/develop/built/comm-filter.meta.js
-// @downloadURL    https://github.com/udnp/iitc-plugins/raw/comm-filter-plugin/develop/built/comm-filter.user.js
-// @description    [udnp-2016-04-06-102111] COMM Filter
+// @updateURL      https://github.com/udnp/iitc-plugins/raw/master/built/comm-filter.meta.js
+// @downloadURL    https://github.com/udnp/iitc-plugins/raw/master/built/comm-filter.user.js
+// @description    [udnp-2016-04-11-123020] COMM Filter
 // @include        https://www.ingress.com/intel*
 // @include        http://www.ingress.com/intel*
 // @match          https://www.ingress.com/intel*
@@ -28,7 +28,7 @@ if(typeof window.plugin !== 'function') window.plugin = function() {};
 //PLUGIN AUTHORS: writing a plugin outside of the IITC build environment? if so, delete these lines!!
 //(leaving them in place might break the 'About IITC' page or break update checks)
 plugin_info.buildName = 'udnp';
-plugin_info.dateTimeVersion = '20160406.102111';
+plugin_info.dateTimeVersion = '20160411.123020';
 plugin_info.pluginId = 'comm-filter';
 //END PLUGIN AUTHORS NOTE
 
@@ -271,6 +271,7 @@ window.plugin.commfilter = (function() {
       this.checked = config.filter[action];
 
       this.dom = document.createElement('label');
+      this.dom.className = 'switch';
       this.dom.textContent = action;
       this.dom.insertBefore(switchDom, this.dom.firstChild);
     };
@@ -520,10 +521,15 @@ window.plugin.commfilter = (function() {
       new FilterSwitch('created'), 
       new FilterSwitch('destroyed')];
 
+    var switchesDom = document.createElement('span');
+    switchesDom.className = 'switchgroup';
+    
     for(var i = 0; i < filterSwitches.length; i++) {
-      dom.appendChild(filterSwitches[i].dom);
+      switchesDom.appendChild(filterSwitches[i].dom);
     }
 
+    dom.appendChild(switchesDom);
+    
     dom.addEventListener('click', function(event){
       for(var i = 0; i < filterSwitches.length; i++) {
         if(event.target.name === filterSwitches[i].name) {
@@ -538,7 +544,7 @@ window.plugin.commfilter = (function() {
 
     $("<style>")
       .prop("type", "text/css")
-      .html("#PLUGIN_COMM_FILTER {\n  height: 24px;\n  display: flex;\n  align-items: center;\n  padding: 0 0.5ex;\n}\n\n#PLUGIN_COMM_FILTER>.title {\n  padding-right: 0.5ex;\n}\n\n#PLUGIN_COMM_FILTER>select {\n  margin: 0 1ex;\n}\n\n#PLUGIN_COMM_FILTER>label {\n  white-space: nowrap;\n  margin-left: 1.2ex;\n}\n\n#PLUGIN_COMM_FILTER>input {\n  height: 24px;\n}\n\n#PLUGIN_COMM_FILTER>input[name=omni] {\n  flex-grow: 1;\n  flex-shrink: 1;\n  flex-basis: 0;\n  min-width: 6ex;\n}\n\n#PLUGIN_COMM_FILTER>input[name=omni]:focus~label {\n  display: none;\n}\n\n#PLUGIN_COMM_FILTER>button {\n  padding: 2px;\n  min-width: 40px;\n  color: #FFCE00;\n  border: 1px solid #FFCE00;\n  background-color: rgba(8, 48, 78, 0.9);\n  text-align: center;\n}\n\n#chat {\n  padding-bottom: 24px;\n}\n\n#chatall>.status, #chatfaction>.status, #chatalerts>.status {\n  height: 20px;\n  text-align: center;\n  font-style: italic;\n}\n\n#chatall>table, #chatfaction>table, #chatalerts>table {\n  table-layout: auto;\n}\n\n#chatall>table td:nth-child(2),\n#chatfaction>table td:nth-child(2),\n#chatalerts>table td:nth-child(2) {\n  width: 15ex;\n}\n\n/* tentatively to show 3 log lines on minimized */\n#chat {\n  height: 84px; /* 60px + 24px */\n}\n\n/* tentatively to show 3 log lines on minimized */\n#chatcontrols {\n  bottom: 106px; /* 82px + 24px */\n}\n\n/* hack chat.js divider */\n#chatall>table tr.divider,\n#chatfaction>table tr.divider,\n#chatalerts>table tr.divider {\n  border-top: solid 1px #bbb;\n}\n\n#chatall>table tr.divider>td,\n#chatfaction>table tr.divider>td,\n#chatalerts>table tr.divider>td {\n  padding-top: 3px;\n}\n\n#chatall>table tr.divider summary,\n#chatfaction>table tr.divider summary,\n#chatalerts>table tr.divider summary {\n  box-sizing: border-box;\n  padding-left: 2ex;\n}\n")
+      .html("#PLUGIN_COMM_FILTER {\n  display: flex;\n  align-items: center;\n  padding: 0 0.5ex;\n}\n\n#PLUGIN_COMM_FILTER .title {\n  padding-right: 0.5ex;\n  flex: none; /* for Android K WebView */\n}\n\n#PLUGIN_COMM_FILTER>select {\n  margin: 0 1ex;\n}\n\n#PLUGIN_COMM_FILTER>.switchgroup {\n  overflow-x: auto;\n  display: inline-flex;\n}\n\n#PLUGIN_COMM_FILTER .switch {\n  white-space: nowrap;\n  margin-left: 1.2ex;\n  flex: none; /* for Android K WebView */\n  display: inline-flex;\n  align-items: center;\n}\n\n#PLUGIN_COMM_FILTER>input[name=omni] {\n  flex-grow: 1;\n  flex-shrink: 0;\n  flex-basis: auto;\n  width: 16ex;\n}\n\n#PLUGIN_COMM_FILTER>input[name=omni]:focus~.switchgroup {\n  display: none;\n}\n\n#PLUGIN_COMM_FILTER>button {\n  padding: 2px;\n  min-width: 40px;\n  color: #FFCE00;\n  border: 1px solid #FFCE00;\n  background-color: rgba(8, 48, 78, 0.9);\n  text-align: center;\n}\n\n#chat {\n  padding-bottom: 24px;\n}\n\n#chatall>.status, #chatfaction>.status, #chatalerts>.status {\n  height: 20px;\n  text-align: center;\n  font-style: italic;\n}\n\n#chatall>table, #chatfaction>table, #chatalerts>table {\n  table-layout: auto;\n}\n\n#chatall>table td:nth-child(2),\n#chatfaction>table td:nth-child(2),\n#chatalerts>table td:nth-child(2) {\n  width: 15ex;\n}\n\n/* tentatively to show 3 log lines on minimized */\n#chat {\n  height: 84px; /* 60px + 24px */\n}\n\n/* tentatively to show 3 log lines on minimized */\n#chatcontrols {\n  bottom: 106px; /* 82px + 24px */\n}\n\n/* hack chat.js divider */\n#chatall>table tr.divider,\n#chatfaction>table tr.divider,\n#chatalerts>table tr.divider {\n  border-top: solid 1px #bbb;\n}\n\n#chatall>table tr.divider>td,\n#chatfaction>table tr.divider>td,\n#chatalerts>table tr.divider>td {\n  padding-top: 3px;\n}\n\n#chatall>table tr.divider summary,\n#chatfaction>table tr.divider summary,\n#chatalerts>table tr.divider summary {\n  box-sizing: border-box;\n  padding-left: 2ex;\n}\n")
       .appendTo("head");
   }
 

src/comm-filter.css

@@ -1,35 +1,39 @@
 #PLUGIN_COMM_FILTER {
-  height: 24px;
   display: flex;
   align-items: center;
   padding: 0 0.5ex;
 }
 
-#PLUGIN_COMM_FILTER>.title {
+#PLUGIN_COMM_FILTER .title {
   padding-right: 0.5ex;
+  flex: none; /* for Android K WebView */
 }
 
 #PLUGIN_COMM_FILTER>select {
   margin: 0 1ex;
 }
 
-#PLUGIN_COMM_FILTER>label {
-  white-space: nowrap;
-  margin-left: 1.2ex;
+#PLUGIN_COMM_FILTER>.switchgroup {
+  overflow-x: auto;
+  display: inline-flex;
 }
 
-#PLUGIN_COMM_FILTER>input {
-  height: 24px;
+#PLUGIN_COMM_FILTER .switch {
+  white-space: nowrap;
+  margin-left: 1.2ex;
+  flex: none; /* for Android K WebView */
+  display: inline-flex;
+  align-items: center;
 }
 
 #PLUGIN_COMM_FILTER>input[name=omni] {
   flex-grow: 1;
-  flex-shrink: 1;
-  flex-basis: 0;
-  min-width: 6ex;
+  flex-shrink: 0;
+  flex-basis: auto;
+  width: 16ex;
 }
 
-#PLUGIN_COMM_FILTER>input[name=omni]:focus~label {
+#PLUGIN_COMM_FILTER>input[name=omni]:focus~.switchgroup {
   display: none;
 }
 

src/comm-filter.user.js

@@ -259,6 +259,7 @@ window.plugin.commfilter = (function() {
       this.checked = config.filter[action];
 
       this.dom = document.createElement('label');
+      this.dom.className = 'switch';
       this.dom.textContent = action;
       this.dom.insertBefore(switchDom, this.dom.firstChild);
     };
@@ -508,10 +509,15 @@ window.plugin.commfilter = (function() {
       new FilterSwitch('created'), 
       new FilterSwitch('destroyed')];
 
+    var switchesDom = document.createElement('span');
+    switchesDom.className = 'switchgroup';
+    
     for(var i = 0; i < filterSwitches.length; i++) {
-      dom.appendChild(filterSwitches[i].dom);
+      switchesDom.appendChild(filterSwitches[i].dom);
     }
 
+    dom.appendChild(switchesDom);
+    
     dom.addEventListener('click', function(event){
       for(var i = 0; i < filterSwitches.length; i++) {
         if(event.target.name === filterSwitches[i].name) {