|
@@ -27,7 +27,7 @@ function makeFrame(lx, ly, rx, ry, content = "", id = "", defaultpara = "", show
|
|
}
|
|
}
|
|
console.log(content);
|
|
console.log(content);
|
|
if(content != "empty"){
|
|
if(content != "empty"){
|
|
- console.log("drinn");
|
|
|
|
|
|
+ console.log("drinn");
|
|
|
|
|
|
//add new ellement to storage
|
|
//add new ellement to storage
|
|
window.storage.push({lx:lx, ly:ly, rx:rx, ry: ry})
|
|
window.storage.push({lx:lx, ly:ly, rx:rx, ry: ry})
|
|
@@ -58,18 +58,18 @@ function makeFrame(lx, ly, rx, ry, content = "", id = "", defaultpara = "", show
|
|
container.appendChild(cell);
|
|
container.appendChild(cell);
|
|
//Create new element with width, heigth and content
|
|
//Create new element with width, heigth and content
|
|
//$(".item" + lx + "-" + ly).css({"display": "block", "border-style": "solid", "border-color": "blue", "grid-column": (lx+1) + " / span " + (rx-lx+1), "grid-row": ly+1 + " / span " + (ry-ly+1)});
|
|
//$(".item" + lx + "-" + ly).css({"display": "block", "border-style": "solid", "border-color": "blue", "grid-column": (lx+1) + " / span " + (rx-lx+1), "grid-row": ly+1 + " / span " + (ry-ly+1)});
|
|
-
|
|
|
|
if(content != null && content != ""){
|
|
if(content != null && content != ""){
|
|
-
|
|
|
|
|
|
+
|
|
var fullurl = content;
|
|
var fullurl = content;
|
|
//encode default parameter in URL
|
|
//encode default parameter in URL
|
|
if(defaultpara != "{}"){
|
|
if(defaultpara != "{}"){
|
|
var fullurl = fullurl + "?";
|
|
var fullurl = fullurl + "?";
|
|
for (var key in defaultpara) {
|
|
for (var key in defaultpara) {
|
|
if (defaultpara.hasOwnProperty(key)) {
|
|
if (defaultpara.hasOwnProperty(key)) {
|
|
- fullurl = fullurl + key + "=" + defaultpara[key] + "&";
|
|
|
|
|
|
+ fullurl = fullurl + key + "=" + encodeURIComponent(defaultpara[key]) + "&";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ fullurl = fullurl.slice(0, -1);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|