Skip to content

Commit

Permalink
fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
naeioi committed Apr 22, 2015
1 parent 2b04453 commit bcee2db
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions js/Controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ define(['createjs', 'jquery', 'ImageText', 'TextLine', 'Model'], function(create
def = def.then(function(){
var bound = model.getBounds();
if(bound.width > self.stage.canvas.width){
model.scaleY = model.scaleX = self.stage.canvas.width / 2 / bound.width;
model.x = self.stage.canvas.width / 4;
model.scaleY = model.scaleX = self.stage.canvas.width / bound.width;
model.x = 0;
}
else{
model.x = (self.stage.canvas.width - bound.width) / 2;
Expand Down
4 changes: 2 additions & 2 deletions pcs.1.1.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
//version = 1.1
$str=$_GET['text'];

/*
# detect if the string was passed in as unicode
$text_encoding = mb_detect_encoding($str, 'UTF-8, ISO-8859-1');
# make sure it's in unicode
Expand All @@ -12,7 +12,7 @@
# html numerically-escape everything (&#[dec];)
$str = mb_encode_numericentity($str,
array (0x0, 0xffff, 0, 0xffff), 'UTF-8');

*/
$fontsize=$_GET['size'];
$dir=$_GET['dir'];
$color=$_GET['color'];
Expand Down
2 changes: 1 addition & 1 deletion test.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<button id='btn2'>change style</button>
<input id="fileSelect" type="file">
<div id="wrap">
<canvas id="canvas" width=800 height=1000></canvas>
<canvas id="canvas" width=600 height=1500></canvas>
</div>
<!--script src="js/Controller.js"></script-->
<script data-main="js/test_main" src="lib/require.js"></script>
Expand Down

0 comments on commit bcee2db

Please sign in to comment.