0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2025-06-11 09:23:17 +02:00
This commit is contained in:
peteruithoven
2014-01-10 17:21:43 +01:00
parent f7fec0aec6
commit 82b57def39
17 changed files with 166 additions and 167 deletions

View File

@ -77,7 +77,7 @@ function SettingsWindow() {
this.btnOK = this.window.find(".btnOK");
enableButton(this.btnOK,this.submitwindow);
this.window.find(".settingsContainer").load("settings.html", function() {
this.window.find("#settingsContainer").load("settings.html", function() {
console.log("Settings:finished loading settings.html, now loading settings...");
self.form = self.window.find("form");

View File

@ -1,15 +1,15 @@
function initWordArt() {
$("body").append('<div id="svgfont" style="display:none"></div>');
$("#svgfont").load("img/font.svg?");
$(".btnWordArtOk").on("onButtonClick",onWordArtOk);
$(".btnWordArtCancel").on("onButtonClick",onWordArtCancel);
$("#btnWordArtOk").on("onButtonClick",onWordArtOk);
$("#btnWordArtCancel").on("onButtonClick",onWordArtCancel);
}
function showWordArtDialog() {
buttonGroupAdd.hide();
showPopup(popupWordArt);
$(".txtWordArt").focus();
$(".txtWordArt").val(""); //clear textbox
$("#txtWordArt").focus();
$("#txtWordArt").val(""); //clear textbox
}
function onWordArtCancel() {
@ -19,7 +19,7 @@ function onWordArtCancel() {
function onWordArtOk() {
hidePopup(popupWordArt);
var s = $(".txtWordArt").val();
var s = $("#txtWordArt").val();
if (s!=undefined) {
var points = getStringAsPoints(s);

View File

@ -16,36 +16,36 @@ function initButtonBehavior() {
$(".btn").Button(); //initalizes all buttons
btnOops = $(".btnOops");
btnInfo = $(".btnInfo");
btnSettings = $(".btnSettings");
btnNew = $(".btnNew");
btnPrint= $(".btnPrint");
btnStop = $(".btnStop");
btnPrevious = $(".btnPrevious");
btnNext = $(".btnNext");
btnSave = $(".btnSave");
btnWordArt = $(".btnWordArt");
btnZoom = $(".btnZoom");
btnUp = $(".btnUp");
btnDown = $(".btnDown");
btnMove = $(".btnMove");
btnTwistLeft = $(".btnTwistLeft");
btnTwistRight = $(".btnTwistRight");
btnShape = $(".btnShape");
btnRotate = $(".btnRotate");
btnEditClosed = $(".btnEditClosed");
btnEditOpen = $(".btnEditOpen");
btnStraight = $(".btnStraight");
btnDiv = $(".btnDiv");
btnConv = $(".btnConv");
btnSine = $(".btnSine");
btnAdd = $(".btnAdd");
btnToggleVertical = $(".btnToggleVertical");
btnOops = $("#btnOops");
btnInfo = $("#btnInfo");
btnSettings = $("#btnSettings");
btnNew = $("#btnNew");
btnPrint= $("#btnPrint");
btnStop = $("#btnStop");
btnPrevious = $("#btnPrevious");
btnNext = $("#btnNext");
btnSave = $("#btnSave");
btnWordArt = $("#btnWordArt");
btnZoom = $("#btnZoom");
btnUp = $("#btnUp");
btnDown = $("#btnDown");
btnMove = $("#btnMove");
btnTwistLeft = $("#btnTwistLeft");
btnTwistRight = $("#btnTwistRight");
btnShape = $("#btnShape");
btnRotate = $("#btnRotate");
btnEditClosed = $("#btnEditClosed");
btnEditOpen = $("#btnEditOpen");
btnStraight = $("#btnStraight");
btnDiv = $("#btnDiv");
btnConv = $("#btnConv");
btnSine = $("#btnSine");
btnAdd = $("#btnAdd");
btnToggleVertical = $("#btnToggleVertical");
buttonGroupAdd = $("#buttonGroupAdd");
buttonGroupVertical = $(".buttonGroupVertical");
popupWordArt = $(".popupWordArt");
popupShape = $(".popupShape");
buttonGroupVerticalShapes = $("#buttonGroupVerticalShapes");
popupWordArt = $("#popupWordArt");
popupShape = $("#popupShape");
btnNew.on("onButtonClick", onBtnNew);
btnWordArt.on("onButtonClick", onBtnWordArt);
@ -74,7 +74,7 @@ function initButtonBehavior() {
setSketchModified(false);
function onBtnToggleVertical() {
buttonGroupVertical.toggle();
buttonGroupVerticalShapes.toggle();
}
function onBtnAdd() {
@ -198,7 +198,7 @@ function initButtonBehavior() {
function onBtnShape(e) {
showShapeDialog();
buttonGroupAdd.hide();
buttonGroupAdd.fadeOut();
}
enableButton(btnSettings, openSettingsWindow);

View File

@ -27,7 +27,7 @@ function doOnResize() {
function initLayouting() {
console.log("f:initLayouting()");
$drawAreaContainer = $(".drawareacontainer");
$drawAreaContainer = $("#drawareacontainer");
canvas.width = $canvas.width();
canvas.height = $canvas.height(); // canvas.clientHeight;

View File

@ -5,13 +5,13 @@ function initSidebars() {
console.log("f:initSidebars()");
sidebarLeft = new SideBar();
sidebarLeft.init(".leftpanel", "hideleft", function() {
$(".leftpanel").show();
sidebarLeft.init("#leftpanel", "hideleft", function() {
$("#leftpanel").show();
});
sidebarRight = new SideBar();
sidebarRight.init(".rightpanel", "hideright", function() {
$(".rightpanel").show();
sidebarRight.init("#rightpanel", "hideright", function() {
$("#rightpanel").show();
});
}