Merge branch 'comm-filter-plugin/hotfix/issue-3' into comm-filter-plu…

…gin/develop

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

README.ja

@@ -46,6 +46,9 @@
     Chromium 50.0.2657.0 + Tampermonkey v3.12.58 + IITC 0.25.1.20150917.154202
 
 *** リリース履歴
+    - v0.3.4
+      フィルタリングのテキストボックスで [Enter] を入力すると IITC が reload されてしまう問題 (issue#3) を修正しました．
+
     - v0.3.3
       Android 版の IITC でログが常に 3 行分しか表示されなくなっていた問題を修正しました．
 

built/comm-filter.meta.js

@@ -3,12 +3,12 @@
 // @name           IITC plugin: COMM Filter
 // @author         udnp
 // @category       COMM
-// @version        0.3.3.20160315.115849
+// @version        0.3.4.20160323.170022
 // @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    [local-2016-03-15-115849] COMM Filter
+// @description    [local-2016-03-23-170022] 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.3.3.20160315.115849
+// @version        0.3.4.20160323.170022
 // @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    [local-2016-03-15-115849] COMM Filter
+// @description    [local-2016-03-23-170022] 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 = 'local';
-plugin_info.dateTimeVersion = '20160315.115849';
+plugin_info.dateTimeVersion = '20160323.170022';
 plugin_info.pluginId = 'comm-filter';
 //END PLUGIN AUTHORS NOTE
 
@@ -150,8 +150,9 @@ window.plugin.commfilter = (function() {
         dom: null,
         create: function() {
           var dom = document.createElement('button');
-          dom.type = 'reset';
+          dom.type = 'button';
           dom.textContent = 'X';
+          dom.addEventListener('click', resetInput);
 
           this.dom = dom;
           return this;
@@ -229,9 +230,8 @@ window.plugin.commfilter = (function() {
   function setup() {
     if(!comm.create()) return;
 
-    dom = document.createElement('form');
+    dom = document.createElement('header');
     dom.id = ID;
-    dom.addEventListener('reset', resetInput);
 
     inputAgent.create();
     dom.appendChild(inputAgent.dom);
@@ -359,7 +359,7 @@ var setup = function(){
 
   $("<style>")
     .prop("type", "text/css")
-    .html("#PLUGIN_COMM_FILTER>input {\n  width: 30%;\n  height: 24px;\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  height: 24px;\n}\n\n#PLUGIN_COMM_FILTER>input {\n  width: 30%;\n  height: 24px;\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,3 +1,7 @@
+#PLUGIN_COMM_FILTER {
+  height: 24px;
+}
+
 #PLUGIN_COMM_FILTER>input {
   width: 30%;
   height: 24px;

src/comm-filter.user.js

@@ -3,7 +3,7 @@
 // @name           IITC plugin: COMM Filter
 // @author         udnp
 // @category       COMM
-// @version        0.3.3.@@DATETIMEVERSION@@
+// @version        0.3.4.@@DATETIMEVERSION@@
 // @namespace      https://github.com/jonatkins/ingress-intel-total-conversion
 // @source         https://github.com/udnp/iitc-plugins
 // @updateURL      @@UPDATEURL@@
@@ -138,8 +138,9 @@ window.plugin.commfilter = (function() {
         dom: null,
         create: function() {
           var dom = document.createElement('button');
-          dom.type = 'reset';
+          dom.type = 'button';
           dom.textContent = 'X';
+          dom.addEventListener('click', resetInput);
 
           this.dom = dom;
           return this;
@@ -217,9 +218,8 @@ window.plugin.commfilter = (function() {
   function setup() {
     if(!comm.create()) return;
 
-    dom = document.createElement('form');
+    dom = document.createElement('header');
     dom.id = ID;
-    dom.addEventListener('reset', resetInput);
 
     inputAgent.create();
     dom.appendChild(inputAgent.dom);