From 009cd14e87ad6ed2fdbd022f101969618eaf264c Mon Sep 17 00:00:00 2001 From: kimorkim Date: Tue, 10 May 2016 15:53:31 +0900 Subject: [PATCH] =?UTF-8?q?wss=20=EC=A3=BC=EC=86=8C=20=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/entry.js | 4 ++-- dist/entry.min.js | 4 ++-- src/hw.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/entry.js b/dist/entry.js index a015ebce04..5436169d3c 100644 --- a/dist/entry.js +++ b/dist/entry.js @@ -12917,14 +12917,14 @@ p.initSocket = function() { } else { var a = this, b, c; if (-1 < location.protocol.indexOf("https")) { - c = new WebSocket("wss://localhost:23518"); + c = new WebSocket("wss://hardware.play-entry.org:23518"); } else { try { b = new WebSocket("ws://localhost:23518"); } catch (d) { } try { - c = new WebSocket("wss://localhost:23518"); + c = new WebSocket("wss://hardware.play-entry.org:23518"); } catch (d) { } } diff --git a/dist/entry.min.js b/dist/entry.min.js index f7d39da68b..c314f02a82 100644 --- a/dist/entry.min.js +++ b/dist/entry.min.js @@ -1210,8 +1210,8 @@ f-e?(e+=k.width+5,f-=l.width+5,m=0):0===b.length?(e=(e+f)/2-3,f=e+6):(e=Math.max e!=b.length-1&&(q=b[e+1]),g+=l.width,lP=initX,k=initY+30*f,l.group.attr({transform:"translate("+lP+","+k+")"}),initX+=l.width+10,g>d-(l.width+q.width/2.2)&&(f+=1,initX=h,g=0)};a._movePort=function(b,a,d,e){var f=a,g=b.box.x*this.scale,h=b.box.y*this.scale;a>e?(f=a-b.width,a=a>g&&g>e?"M"+g+","+d+"L"+g+","+h:"M"+(a+e)/2+","+d+"l0,"+(h>d?28:-3)+"H"+g+"L"+g+","+h):a=ad?28:-3)+"H"+g+"L"+g+","+h;b.group.attr({transform:"translate("+f+","+d+")"}); b.path.attr({d:a})}})(Entry.HWMonitor.prototype);Entry.HW=function(){this.connectTrial=0;this.isFirstConnect=!0;this.initSocket();this.connected=!1;this.portData={};this.sendQueue={};this.outputQueue={};this.settingQueue={};this.socketType=this.hwModule=this.selectedDevice=null;Entry.addEventListener("stop",this.setZero);this.hwInfo={11:Entry.Arduino,12:Entry.SensorBoard,13:Entry.CODEino,15:Entry.dplay,16:Entry.nemoino,17:Entry.Xbot,24:Entry.Hamster,25:Entry.Albert,31:Entry.Bitbrick,42:Entry.Arduino,51:Entry.Neobot,71:Entry.Robotis_carCont,72:Entry.Robotis_openCM70}}; Entry.HW.TRIAL_LIMIT=1;p=Entry.HW.prototype; -p.initSocket=function(){try{if(this.connectTrial>=Entry.HW.TRIAL_LIMIT)this.isFirstConnect||Entry.toast.alert(Lang.Menus.connect_hw,Lang.Menus.connect_fail,!1),this.isFirstConnect=!1;else{var a=this,b,c;if(-1=Entry.HW.TRIAL_LIMIT)this.isFirstConnect||Entry.toast.alert(Lang.Menus.connect_hw,Lang.Menus.connect_fail,!1),this.isFirstConnect=!1;else{var a=this,b,c;if(-1 -1) { - socketSecurity = new WebSocket("wss://localhost:23518"); + socketSecurity = new WebSocket("wss://hardware.play-entry.org:23518"); } else { try{ socket = new WebSocket("ws://localhost:23518"); } catch(e) {} try{ - socketSecurity = new WebSocket("wss://localhost:23518"); + socketSecurity = new WebSocket("wss://hardware.play-entry.org:23518"); } catch(e) { } }