Permalink
Browse files

clean up

some kind of comment text got into the code
  • Loading branch information...
1 parent ff85a12 commit c1f97183d048abe241a2f9d7929ad28f0df44b36 @mrflix committed Sep 8, 2011
Showing with 2 additions and 6 deletions.
  1. +0 −3 builder.html
  2. +2 −3 js/numbers.js
View
3 builder.html
@@ -33,7 +33,6 @@
</div> <!-- /codeBox -->
</div> <!-- /main -->
<div id="layerstyle">
-<<<<<<< HEAD
<div id="headerBg"></div>
<div id="dialog" class="window">
<div class="head moveable">
@@ -363,7 +362,6 @@
</div>
</div>
</div><!-- /ColorPicker -->
-=======
<div id="headerBg"></div>
<div id="dialog" class="window">
<div class="head moveable">
@@ -693,7 +691,6 @@
</div>
</div>
</div><!-- /ColorPicker -->
->>>>>>> cleanup: tabs replaced by 4 spaces
</div> <!-- /LayerStyle -->
<script type="text/javascript" src="js/jquery-1.6.min.js"></script>
<script type="text/javascript" src="js/ui.js"></script>
View
5 js/numbers.js
@@ -76,7 +76,6 @@ var numbers = {
if (numbers.match && numbers.value !== "") colorpicker.update(numbers.temporaryMode);
break;
case 'style':
- console.log(numbers.value);
if (numbers.value !== "") numbers.$input.change();
break;
}
@@ -102,7 +101,6 @@ var numbers = {
} else {
character = String.fromCharCode(keycode);
}
- //console.log("Current Value: "+numbers.value+"\nKeycode: "+keycode);
if(numbers.commandKeyPressed){
isCopyCutPasteKey = numbers.copyCutPasteKeys.join(",").match(new RegExp(keycode));
if(isCopyCutPasteKey){
@@ -165,7 +163,8 @@ var numbers = {
numbers.value = numbers.$input.val();
integer = parseInt(numbers.value, 10);
if(numbers.regex.test(integer)){
- numbers.$input.val(integer);
+ console.log(integer);
+ numbers.$input.val(integer ? integer : "");
return true;
}
event.preventDefault();

0 comments on commit c1f9718

Please sign in to comment.