Skip to content

Commit 3674cc4

Browse files
author
SeungpilPark
committed
#9 Invalid args fixed
1 parent 9874512 commit 3674cc4

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT-All.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT-min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33014,15 +33014,15 @@ OG.graph.Canvas.prototype = {
3301433014
me._CONFIG.BACKDOOR.container = existBackdoor;
3301533015

3301633016
//최초에는 캔버스 크기를 조정해줌.
33017-
var canvasScale = canvas.getScale();
33018-
var canvasSize = canvas.getCanvasSize();
33017+
var canvasScale = me.getScale();
33018+
var canvasSize = me.getCanvasSize();
3301933019
if (canvasSize[0] < w * (scale / 100) * canvasScale) {
3302033020
canvasSize[0] = w * (scale / 100) * canvasScale;
3302133021
}
3302233022
if (canvasSize[1] < h * (scale / 100) * canvasScale) {
3302333023
canvasSize[1] = h * (scale / 100) * canvasScale;
3302433024
}
33025-
canvas.setCanvasSize(canvasSize);
33025+
me.setCanvasSize(canvasSize);
3302633026

3302733027

3302833028
//기존 캔버스의 백그라운드 속성 초기화
@@ -33048,22 +33048,22 @@ OG.graph.Canvas.prototype = {
3304833048
var height = me._CONFIG.BACKDOOR.height;
3304933049

3305033050
var existBackdoor = me._CONFIG.BACKDOOR.container;
33051-
var canvasScale = canvas.getScale();
33051+
var canvasScale = me.getScale();
3305233052

3305333053
existBackdoor.width(width * (backDoorScale / 100) * canvasScale);
3305433054
existBackdoor.height(height * (backDoorScale / 100) * canvasScale);
3305533055
existBackdoor.css('opacity', backDoorOpacity);
3305633056

3305733057
//scale 값이 실제로 들어오면 캔버스 사이즈를 조정해준다.
3305833058
if (scale) {
33059-
var canvasSize = canvas.getCanvasSize();
33059+
var canvasSize = me.getCanvasSize();
3306033060
if (canvasSize[0] < width * (backDoorScale / 100) * canvasScale) {
3306133061
canvasSize[0] = width * (backDoorScale / 100) * canvasScale;
3306233062
}
3306333063
if (canvasSize[1] < height * (backDoorScale / 100) * canvasScale) {
3306433064
canvasSize[1] = height * (backDoorScale / 100) * canvasScale;
3306533065
}
33066-
canvas.setCanvasSize(canvasSize);
33066+
me.setCanvasSize(canvasSize);
3306733067
me.updateSlider();
3306833068
}
3306933069
},
@@ -33404,7 +33404,7 @@ OG.graph.Canvas.prototype = {
3340433404
var opacity = me._CONFIG.BACKDOOR.opacity;
3340533405
var width = me._CONFIG.BACKDOOR.width;
3340633406
var height = me._CONFIG.BACKDOOR.height;
33407-
var canvasScale = canvas.getScale();
33407+
var canvasScale = me.getScale();
3340833408
var contextWidth = sliderImageWrapper.width();
3340933409
var fixedWidth = (width * (scale / 100) / canvasSize[0] * canvasScale) * contextWidth;
3341033410
var fixedHeight = fixedWidth * height / width;

‎src/main/webapp/src/graph/Canvas.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -955,15 +955,15 @@ OG.graph.Canvas.prototype = {
955955
me._CONFIG.BACKDOOR.container = existBackdoor;
956956

957957
//최초에는 캔버스 크기를 조정해줌.
958-
var canvasScale = canvas.getScale();
959-
var canvasSize = canvas.getCanvasSize();
958+
var canvasScale = me.getScale();
959+
var canvasSize = me.getCanvasSize();
960960
if (canvasSize[0] < w * (scale / 100) * canvasScale) {
961961
canvasSize[0] = w * (scale / 100) * canvasScale;
962962
}
963963
if (canvasSize[1] < h * (scale / 100) * canvasScale) {
964964
canvasSize[1] = h * (scale / 100) * canvasScale;
965965
}
966-
canvas.setCanvasSize(canvasSize);
966+
me.setCanvasSize(canvasSize);
967967

968968

969969
//기존 캔버스의 백그라운드 속성 초기화
@@ -989,22 +989,22 @@ OG.graph.Canvas.prototype = {
989989
var height = me._CONFIG.BACKDOOR.height;
990990

991991
var existBackdoor = me._CONFIG.BACKDOOR.container;
992-
var canvasScale = canvas.getScale();
992+
var canvasScale = me.getScale();
993993

994994
existBackdoor.width(width * (backDoorScale / 100) * canvasScale);
995995
existBackdoor.height(height * (backDoorScale / 100) * canvasScale);
996996
existBackdoor.css('opacity', backDoorOpacity);
997997

998998
//scale 값이 실제로 들어오면 캔버스 사이즈를 조정해준다.
999999
if (scale) {
1000-
var canvasSize = canvas.getCanvasSize();
1000+
var canvasSize = me.getCanvasSize();
10011001
if (canvasSize[0] < width * (backDoorScale / 100) * canvasScale) {
10021002
canvasSize[0] = width * (backDoorScale / 100) * canvasScale;
10031003
}
10041004
if (canvasSize[1] < height * (backDoorScale / 100) * canvasScale) {
10051005
canvasSize[1] = height * (backDoorScale / 100) * canvasScale;
10061006
}
1007-
canvas.setCanvasSize(canvasSize);
1007+
me.setCanvasSize(canvasSize);
10081008
me.updateSlider();
10091009
}
10101010
},
@@ -1345,7 +1345,7 @@ OG.graph.Canvas.prototype = {
13451345
var opacity = me._CONFIG.BACKDOOR.opacity;
13461346
var width = me._CONFIG.BACKDOOR.width;
13471347
var height = me._CONFIG.BACKDOOR.height;
1348-
var canvasScale = canvas.getScale();
1348+
var canvasScale = me.getScale();
13491349
var contextWidth = sliderImageWrapper.width();
13501350
var fixedWidth = (width * (scale / 100) / canvasSize[0] * canvasScale) * contextWidth;
13511351
var fixedHeight = fixedWidth * height / width;

0 commit comments

Comments
 (0)