)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{cj=f.href}catch(cy){cj=e.createElement("a"),cj.href="",cj=cj.href}ck=ct.exec(cj.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:cj,isLocal:cn.test(ck[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,ck[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==ck[1]&&i[2]==ck[2]&&(i[3]||(i[1]==="http:"?80:443))==(ck[3]||(ck[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cQ.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d
-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/resources/library/interactivities/Balance.wgt/config.xml b/resources/library/interactivities/Balance.wgt/config.xml
index 738583bf..8b6e7741 100644
--- a/resources/library/interactivities/Balance.wgt/config.xml
+++ b/resources/library/interactivities/Balance.wgt/config.xml
@@ -3,8 +3,8 @@
xmlns:ub="http://uniboard.mnemis.com/widgets"
id="http://www.njin.fr/sankore/apps/balance"
version="1.0"
- width="1025"
- height="880"
+ width="540"
+ height="450"
ub:resizable="true">
La Balance
diff --git a/resources/library/interactivities/Balance.wgt/css/images/delete.png b/resources/library/interactivities/Balance.wgt/css/images/delete.png
index 22bf8f29..c896c1ab 100644
Binary files a/resources/library/interactivities/Balance.wgt/css/images/delete.png and b/resources/library/interactivities/Balance.wgt/css/images/delete.png differ
diff --git a/resources/library/interactivities/Balance.wgt/css/images/graduations.png b/resources/library/interactivities/Balance.wgt/css/images/graduations.png
index 88e65ba3..5756880c 100644
Binary files a/resources/library/interactivities/Balance.wgt/css/images/graduations.png and b/resources/library/interactivities/Balance.wgt/css/images/graduations.png differ
diff --git a/resources/library/interactivities/Balance.wgt/css/images/pivot.png b/resources/library/interactivities/Balance.wgt/css/images/pivot.png
index d5137e29..72e8e264 100644
Binary files a/resources/library/interactivities/Balance.wgt/css/images/pivot.png and b/resources/library/interactivities/Balance.wgt/css/images/pivot.png differ
diff --git a/resources/library/interactivities/Balance.wgt/css/images/scale.png b/resources/library/interactivities/Balance.wgt/css/images/scale.png
index 386184c2..b201a386 100644
Binary files a/resources/library/interactivities/Balance.wgt/css/images/scale.png and b/resources/library/interactivities/Balance.wgt/css/images/scale.png differ
diff --git a/resources/library/interactivities/Balance.wgt/css/images/scales.png b/resources/library/interactivities/Balance.wgt/css/images/scales.png
index 1fea726c..cb25be60 100644
Binary files a/resources/library/interactivities/Balance.wgt/css/images/scales.png and b/resources/library/interactivities/Balance.wgt/css/images/scales.png differ
diff --git a/resources/library/interactivities/Balance.wgt/css/images/weight-add.png b/resources/library/interactivities/Balance.wgt/css/images/weight-add.png
index 9e043661..329d4969 100644
Binary files a/resources/library/interactivities/Balance.wgt/css/images/weight-add.png and b/resources/library/interactivities/Balance.wgt/css/images/weight-add.png differ
diff --git a/resources/library/interactivities/Balance.wgt/css/images/weight.png b/resources/library/interactivities/Balance.wgt/css/images/weight.png
index 32b0c536..5970846e 100644
Binary files a/resources/library/interactivities/Balance.wgt/css/images/weight.png and b/resources/library/interactivities/Balance.wgt/css/images/weight.png differ
diff --git a/resources/library/interactivities/Balance.wgt/css/main.css b/resources/library/interactivities/Balance.wgt/css/main.css
index 616ed26e..baf0662b 100644
--- a/resources/library/interactivities/Balance.wgt/css/main.css
+++ b/resources/library/interactivities/Balance.wgt/css/main.css
@@ -15,7 +15,7 @@
}
#scalesWrapper {
- padding: 0px 100px 200px;
+ padding: 0px 100px 100px;
position: relative;
}
@@ -29,10 +29,10 @@
.scale {
position: absolute;
- width: 250px;
+ width: 125px;
height: 0;
- padding: 200px 45px 50px;
- top: 145px;
+ padding: 90px 20px 35px;
+ top: 72px;
background: url(images/scale.png) no-repeat center bottom;
}
@@ -45,12 +45,12 @@
#leftScale {
left: 0;
- margin-left: -150px;
+ margin-left: -75px;
}
#rightScale {
right: 0;
- margin-right: -150px;
+ margin-right: -75px;
}
#tray {
@@ -58,27 +58,27 @@
background-color: red;
top: 50%;
margin-top: -1px;
- width: 550px;
- height: 288px;
+ width: 225px;
+ height: 144px;
background: url("images/scales.png") no-repeat center;
}
#graduations {
- width: 100px;
- height: 30px;
+ width: 50px;
+ height: 15px;
position: absolute;
top: 0;
left: 50%;
- margin-left: -50px;
+ margin-left: -25px;
background: url(images/graduations.png) center no-repeat;
}
#pivot {
position: absolute;
- width: 80px;
- height: 80px;
- left: 235px;
- top: 106px;
+ width: 40px;
+ height: 40px;
+ left: 93px;
+ top: 52px;
background: url(images/pivot.png) center no-repeat;
}
@@ -101,14 +101,14 @@
text-indent: -100px;
- width: 68px;
- height: 70px;
+ width: 34px;
+ height: 34px;
margin-left: 10px;
cursor: pointer;
- border-radius: 4px;
+ border-radius: 2px;
border: 1px solid rgba(255,255,255, 0.15);
background: rgba(0,0,0, 0.15) url(images/weight-add.png) center no-repeat;
}
@@ -124,15 +124,15 @@
.object input {
border: none;
- width: 40px;
- padding: none;
- margin: 0 2px 0 0;
+ width: 100%;
+ padding: 0;
+ margin: 0;
text-align: center;
- font-size: 16px;
+ font-size: 12px;
color: #000;
- border-radius: 3px;
+ border-radius: 2px;
background-color: #FFF;
box-shadow: 0 1px 2px rgba(0,0,0, 0.4);
}
@@ -140,7 +140,7 @@
.object .tools {
display: none;
position: absolute;
- top: -23px;
+ top: -13px;
width: 100%;
text-align: center;
}
@@ -150,8 +150,8 @@
position: relative;
overflow: hidden;
cursor: pointer;
- width: 22px;
- height: 22px;
+ width: 11px;
+ height: 11px;
text-indent: -100px;
border: none;
margin: 0;
@@ -180,7 +180,7 @@
position: absolute;
width: 100%;
height: 20px;
- top: 72px;
+ top: 36px;
border-radius: 4px;
box-shadow: 0 3px 0 #999, 0 1px 2px rgba(0,0,0, .65);
background-color: #CCC;
@@ -198,9 +198,9 @@
#weights {
display: none;
position: absolute;
- top: 40px;
- right: 40px;
- width: 230px;
+ top: 20px;
+ right: 0px;
+ width: 160px;
}
.onEdit #weights {
@@ -213,21 +213,26 @@
.weight {
position: relative;
- width: 64px;
- height: 70px;
-
+
+ width: 32px;
+ height: 35px;
+
margin-left: 10px;
margin-bottom: 30px;
- font-size: 16px;
+ font-size: 12px;
text-align: center;
color: #CCC;
text-shadow: 0 -1px 0 #000;
}
+.weight .unit {
+ font-size: 10px;
+}
+
.weight .amount {
height: 100%;
- padding: 4px 4px 0;
+ padding: 4px 2px 0;
border-radius: 4px;
border: 1px solid rgba(255,255,255, 0.15);
background-color: rgba(0,0,0, 0.15);
@@ -235,10 +240,10 @@
.weight > div.bg {
position: absolute;
- left: -3px;
+ left: -2px;
bottom: -18px;
- width: 70px;
- height: 64px;
+ width: 35px;
+ height: 32px;
background: url(images/weight.png) no-repeat center bottom;
}
diff --git a/resources/library/interactivities/Balance.wgt/js/main.js b/resources/library/interactivities/Balance.wgt/js/main.js
index 089559fb..9b5bc3f6 100644
--- a/resources/library/interactivities/Balance.wgt/js/main.js
+++ b/resources/library/interactivities/Balance.wgt/js/main.js
@@ -1,14 +1,47 @@
+var weighValues = [500,200,100,50,20,10];
+
function onTemplateLoadedCallback(app) {
- $("#weights").append($(Mustache.render(weightTemplate, {weight: 500})));
- $("#weights").append($(Mustache.render(weightTemplate, {weight: 200})));
- $("#weights").append($(Mustache.render(weightTemplate, {weight: 100})));
- $("#weights").append($(Mustache.render(weightTemplate, {weight: 50})));
- $("#weights").append($(Mustache.render(weightTemplate, {weight: 20})));
- $("#weights").append($(Mustache.render(weightTemplate, {weight: 10})));
+ $.each(weighValues, function(){
+ $("#weights").append($(Mustache.render(weightTemplate, {weight: this})));
+ });
$("#weights > .weight").draggable({helper: "clone"});
+
+ $("#leftScale").droppable({
+ accept: ".object",
+ drop: function(event, ui) {
+ if($(ui.draggable).hasClass("inScale"))
+ return;
+
+ var object = $(ui.draggable).clone();
+ object.data("weight", $(ui.draggable).data("weight"));
+
+ object.addClass("inScale");
+ $("#leftScale").append(object);
+
+ placeObject($("#leftScale"), object);
+
+ refreshScales();
+
+ object.draggable({
+ stop: function(event, ui) {
+ if($(ui.helper).hasClass("onOut")) {
+ $(ui.helper).remove();
+ refreshScales();
+ }
+ }
+ });
+ },
+ out: function(event, ui) {
+ $(ui.draggable).addClass("onOut");
+ },
+ over: function(event, ui) {
+ $(ui.draggable).removeClass("onOut");
+ }
+ });
+
$("#rightScale").droppable({
- accept: ".weight",
+ accept: ".weight.right",
drop: function(event, ui) {
if($(ui.draggable).hasClass("inScale"))
return;
@@ -72,6 +105,10 @@ function objectForGUID(app, guid) {
window.object = guid;
var objectUi = $(Mustache.render(objectTemplate, window));
var weight = getWeightFor(app.parameters, guid);
+
+ if(!app.onEdit && (weight == undefined || $.trim(weight) == ""))
+ weight = weighValues[Math.floor(Math.random()*weighValues.length)];
+
if(weight !== undefined) {
objectUi.data("weight", weight);
objectUi.find("input[name=weight]").val(weight);
@@ -137,8 +174,8 @@ function placeObject($container, $object) {
var count = $container.children().size() - 1;
- var left = width * (count % 4) + 25;
- var bottom = height * (Math.floor(count / 4)) + 40;
+ var left = width * (count % 4) + 5;
+ var bottom = height * (Math.floor(count / 4)) + 12;
log("Place at ["+left+" , "+bottom+"]");
$object.css("left", left+"px").css("bottom", bottom+"px");
@@ -215,39 +252,6 @@ function reloadApp(app) {
}
refreshScales();
-
- $("#leftScale").droppable({
- accept: ".object",
- drop: function(event, ui) {
- if($(ui.draggable).hasClass("inScale"))
- return;
-
- var object = $(ui.draggable).clone();
- object.data("weight", $(ui.draggable).data("weight"));
-
- object.addClass("inScale");
- $("#leftScale").append(object);
-
- placeObject($("#leftScale"), object);
-
- refreshScales();
-
- object.draggable({
- stop: function(event, ui) {
- if($(ui.helper).hasClass("onOut")) {
- $(ui.helper).remove();
- refreshScales();
- }
- }
- });
- },
- out: function(event, ui) {
- $(ui.draggable).addClass("onOut");
- },
- over: function(event, ui) {
- $(ui.draggable).removeClass("onOut");
- }
- });
if(app.onEdit) {
diff --git a/resources/library/interactivities/Balance.wgt/js/templates.js b/resources/library/interactivities/Balance.wgt/js/templates.js
index 1f683036..e18176e9 100644
--- a/resources/library/interactivities/Balance.wgt/js/templates.js
+++ b/resources/library/interactivities/Balance.wgt/js/templates.js
@@ -23,8 +23,8 @@ var objectTemplate =
''+
''+
'
'+
- 'g
'+
+ ''+
'"+n+"
");
diff --git a/resources/library/interactivities/Train.wgt/js/templates.js b/resources/library/interactivities/Train.wgt/js/templates.js
index e62c381e..f53d27dd 100644
--- a/resources/library/interactivities/Train.wgt/js/templates.js
+++ b/resources/library/interactivities/Train.wgt/js/templates.js
@@ -31,6 +31,7 @@ var parametersTemplate =
''+
'