diff options
| -rw-r--r-- | index.html | 4 | ||||
| -rw-r--r-- | scripts/rhizicore.js | 7 |
2 files changed, 0 insertions, 11 deletions
@@ -49,11 +49,7 @@ <div id="suggestion" > -<<<<<<< HEAD <form> <input id="textanalyser" size="70" placeholder="Type here to create a network:" onkeyup="expand(this);"/></form> -======= - <form> <input id = "textanalyser" size= "70" placeholder = "Type here to create a network:" onkeyup = "expand(this);"/></form> ->>>>>>> #62 </div> <div class="typeselection"> diff --git a/scripts/rhizicore.js b/scripts/rhizicore.js index d39471d1..0ac2f29a 100644 --- a/scripts/rhizicore.js +++ b/scripts/rhizicore.js @@ -1033,15 +1033,8 @@ function customSize(type) { } function expand(obj){ -<<<<<<< HEAD if (!obj.savesize) { obj.savesize = obj.size; } obj.size = Math.max(obj.savesize, obj.value.length); -======= - if (!obj.savesize) - obj.savesize = obj.size; - obj.size = Math.max(obj.savesize,obj.value.length); - ->>>>>>> #62 } |