From dda3212eeb21b0057fba9c395a16c1ac5b1a71be Mon Sep 17 00:00:00 2001 From: garbash Date: Thu, 2 Oct 2014 09:32:41 +0300 Subject: Undo of commit Merge branch '#62' into Prototype It broke the input box --- scripts/rhizicore.js | 7 ------- 1 file changed, 7 deletions(-) (limited to 'scripts') 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 } -- cgit v1.3.1