diff --git a/Gruntfile.js b/Gruntfile.js index fcbee2c..ee98f05 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -16,34 +16,34 @@ module.exports = function(grunt) { }, js: { src: [ - 'js_src/Events.js', - 'js_src/Class.js', - 'js_src/Button.js', - 'js_src/Popup.js', - 'js_src/btnMove.js', - 'js_src/WordArt.js', - 'js_src/Shape.js', - 'js_src/Svg.js', - 'js_src/Keyboard.js', - 'js_src/SettingsWindow.js', - 'js_src/UpdatePanel.js', - 'js_src/PrinterPanel.js', - 'js_src/Help.js', - 'js_src/d3dServerInterfacing.js', - 'js_src/verticalShapes.js', - 'js_src/buttonbehaviors.js', - 'js_src/canvasDrawing.js', - 'js_src/previewRendering.js', - 'js_src/gcodeGenerating.js', - 'js_src/init_layout.js', - 'js_src/Printer.js', - 'js_src/Progressbar.js', - 'js_src/Thermometer.js', - 'js_src/utils.js', - 'js_src/sidebar.js', - 'js_src/Message.js', - 'js_src/main.js', - 'js_src/sketches.js' + 'js/Events.js', + 'js/Class.js', + 'js/Button.js', + 'js/Popup.js', + 'js/btnMove.js', + 'js/WordArt.js', + 'js/Shape.js', + 'js/Svg.js', + 'js/Keyboard.js', + 'js/SettingsWindow.js', + 'js/UpdatePanel.js', + 'js/PrinterPanel.js', + 'js/Help.js', + 'js/d3dServerInterfacing.js', + 'js/verticalShapes.js', + 'js/buttonbehaviors.js', + 'js/canvasDrawing.js', + 'js/previewRendering.js', + 'js/gcodeGenerating.js', + 'js/init_layout.js', + 'js/Printer.js', + 'js/Progressbar.js', + 'js/Thermometer.js', + 'js/utils.js', + 'js/sidebar.js', + 'js/Message.js', + 'js/main.js', + 'js/sketches.js' ], dest: 'www/js/<%= pkg.name %>.js' } @@ -63,8 +63,8 @@ module.exports = function(grunt) { } }, jslibs: { - cwd: "js_src/libs/", -// src: ['js_src/libs/*.js', '!js_src/libs/*.min.js'], // source files mask + cwd: "js/libs/", +// src: ['js/libs/*.js', '!js/libs/*.min.js'], // source files mask src: ['*.js', '!*.min.js'], // source files mask dest: 'www/js/libs/', // destination folder expand: true, // allow dynamic building @@ -112,12 +112,12 @@ module.exports = function(grunt) { }, watch: { javascript: { - files: ["js_src/*", '!www/js/<%= pkg.name %>.min.js', '!www/js/<%= pkg.name %>.js'], + files: ["js/*", '!www/js/<%= pkg.name %>.min.js', '!www/js/<%= pkg.name %>.js'], tasks: ["concat:js", "uglify:js"] // tasks: ["jshint", "concat", "uglify"] }, javascriptLibs: { - files: ["js_src/libs/*"], + files: ["js/libs/*"], tasks: ["uglify:jslibs"] // tasks: ["jshint", "concat", "uglify"] }, diff --git a/___settings.html b/___settings.html deleted file mode 100644 index 601ea2d..0000000 --- a/___settings.html +++ /dev/null @@ -1,154 +0,0 @@ - - - - settings - - - - - - - -
-
- - -
- Print settings - mm
- mm
- mm
- degrees C
-
- mm/s
- mm/s
-
-
-
- * Continuously move platform while printing instead of once per layer -
-
- mm
- mm
- mm/s
-
-
-
-
- -
- Doodle3D settings - px
- mm
-
-
- -
- Network settings - -
- - -
- -
- Access point settings -
-
-
- * The text %%MAC_ADDR_TAIL%% will be replaced by the last 6 digits of your Doodle3D Wi-Fi box's MAC address. - - -
- -
- Client mode settings - - -
-
- - -
-
- -
- GCODE settings -
-
- - -
-
-
- -
- -
-

-
- - \ No newline at end of file diff --git a/css_old/_backup20131010/d3d_btns.css b/css_old/_backup20131010/d3d_btns.css deleted file mode 100644 index 1e60daa..0000000 --- a/css_old/_backup20131010/d3d_btns.css +++ /dev/null @@ -1,179 +0,0 @@ -/*.logo { - background: #f5f5f5 url('../img/logo_full.png') no-repeat left top; -} - -@media screen and (max-width: 500px) { - .logo { - background: #f5f5f5 url('../img/logo_small.png') no-repeat left top; - } -}*/ - -/*body {*/ - /*-moz-user-select: none; *//* disable cut copy paste */ - /*-webkit-user-select: none; *//* disable cut copy paste */ - /*overflow:hidden; *//* This chops off any overhanging divs */ -/*}*/ - -/*img {*/ - /*z-index: 5;*/ - /*pointer-events:none;*/ - /*-webkit-touch-callout: none; *//**//*disable callout, image save panel */ - /*-webkit-tap-highlight-color: transparent; *//**//* "turn off" link highlight */ -/*}*/ - -/* http://stackoverflow.com/questions/5348092/prevent-default-press-but-not-default-drag-in-ios-mobilesafari */ -/*.btn {*/ - /*background-repeat: no-repeat;*/ -/* -webkit-user-select: none;*/ - /*cursor: pointer*/ -/*}*/ - -/* - - INTERFACE BUTTONS - -*/ -/* -#btnNew { - left: 10px; - top: 10px; - width: 194px; - height: 170px; - background: url('../img/buttons/btnNew.png') no-repeat; -} - -#btnPrevious { - left: 20px; - top: 180px; - z-index: 10; -} - -#btnNext { - left: 126px; - top: 186px; - z-index: 10; -} - -#btnSave { - left: 20px; - top: 240px; -} - -#btnOops { - left: 20px; - top: 450px; - width: 146px; - height: 144px; - background: url('../img/buttons/btnOops.png') no-repeat; -} -*/ - -/* -#btnPrint { - right: 15px; - top: 15px; -} - -#btnStop { - right: 20px; - top: 200px; -} - -#btnInfo { - right: 25px; - bottom: 90px; -} - -#btnSettings { - right: 25px; - bottom: 20px; -} -*/ - - - -/* - - DRAW AREA - -*/ - - -/*#drawAreaContainer > .manipulationBtns {*/ -/* -.drawareacontainer > .manipulationBtns { - margin: 5px; -} - -.manipulationBtn { - cursor: pointer; -} - -#btnsUpDown { - position: absolute; - right: 200px; - bottom: -75px; -} -#btnsUpDown > div { - float: left; - padding-right: 8px; - background-repeat: no-repeat; -} - -#btnsTurnLeftRight { - position: absolute; - right: 20px; - bottom: -75px; -} -#btnsTurnLeftRight >div { - float: left; - padding-right: 8px; - background-repeat: no-repeat; -} - -#btnMoveUp { - width: 65px; - height: 61px; - background: url('../img/buttons/btnUp.png'); -} - -#btnMoveDown { - width: 64px; - height: 63px; - background: url('../img/buttons/btnDown.png'); -} - -#btnTwistLeft { - width: 59px; - height: 61px; - background: url('../img/buttons/btnTurnLeft.png'); -} - -#btnTwistRight { - width: 64px; - height: 56px; - background: url('../img/buttons/btnTurnRight.png'); -} -*/ - -/* -#displayTemp { - position: absolute; - right: 55px; - top: 334px; - font-weight: bold; - background: white; - display:none; -} -*/ - -/* -.disabled { - opacity: 0.3; - cursor: default; -} - -#btnStop.disabled { - display: none; -} -*/ \ No newline at end of file diff --git a/css_old/_backup20131010/fixedPosInterface.css b/css_old/_backup20131010/fixedPosInterface.css deleted file mode 100644 index 881dd30..0000000 --- a/css_old/_backup20131010/fixedPosInterface.css +++ /dev/null @@ -1,93 +0,0 @@ -/* -#drawAreaContainer { - position: absolute; - top: 50%; - left: 50%; - background-color: #fff; - width: 65%; - min-width: 500px; - max-width: 650px; - height: 60%; - min-height: 150px; - max-height: 450px; - border: 4px solid #000; - border-radius: 15px; - overflow: hidden; - z-index: 15; - display: none; -} - -#canvasContainers { - display:table; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - width: 100%; - height: 100%; - padding: 0; - margin: 0; -} - -#mycanvasContainer { - display:table-cell; - width: auto; - height: 100%; -} -#mycanvas { - width: 100%; - height: 100%; - margin: 0; - padding: 0; - border-right: 2px solid #333; -} - -#previewContainer { - display:table-cell; - width: 150px; - height: 100%; -} -#preview { - width: 150px; - height: 100%; - float: right; - margin: 0; - padding: 0; -} -*/ - -/* DEBUG THING */ -/* -#preview_tmp { - position: absolute; - top: 0px; - left: 0px; - z-index: 500; - border: 1px solid #f80; - display: none; -} -*/ - -/* - - Buttons and logo's - -*/ -/* -.button { - display: table; -} -*/ - -/*#d3dlogo {*/ - /*position: absolute;*/ - /*top: 15px;*/ - /*left: 31%;*/ - /*width: 399px;*/ - /*height: 139px;*/ - /*background-image: url('../img/logo_full.png');*/ - /*cursor: pointer;*/ -/*}*/ - - diff --git a/css_old/_backup20131010/settingsPopup.css b/css_old/_backup20131010/settingsPopup.css deleted file mode 100644 index 95b407b..0000000 --- a/css_old/_backup20131010/settingsPopup.css +++ /dev/null @@ -1,74 +0,0 @@ -#contentOverlay { - background-color: rgba(255, 255, 255, 0.65); - z-index: 20; - position: absolute; - top: 0px; - left: 0px; - width: 100%; - height: 100%; - display:none; -} -#settings { - background-color: #fff; - z-index: 15; - - position: absolute; - top: 50%; - left: 50%; - width: 835px; - height: 500px; - margin: -250px 0 0 -417.5px; - /*padding: 25px;*/ - - /*overflow: scroll;*/ - /*overflow-y: hidden;*/ - -moz-box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65); - -webkit-box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65); - box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65); - border: 2px solid #222; - border-radius: 15px; - -moz-border-radius: 15px; - -webkit-border-radius: 15px; - overflow: hidden; -} -#settings header { - margin: 25px 25px 0 25px; - height: 44px; -} - -div.content { - margin: 15px 25px 25px 25px; - height: 388px; - display: table; -} - -div.content > div { - height: 100%; -} - -div.content > div.settings { - border: 1px solid rgb(187, 187, 187); - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - - width: 660px; - overflow: scroll; - max-height: 368px; - overflow-x: hidden; - padding: 10px 10px 10px 10px; -} -div.content > div.manipulationBtns { - display: table-cell; - vertical-align: bottom; - width: 125px; - -} - -div.content .btnOK { - width: 85px; - height: 86px; - background: url('../img/buttons/btnOk_settings.png') no-repeat; - margin: 0 0 0 10px; - cursor: pointer; -} diff --git a/css_old/_backup20131011/fixedPosInterface.css b/css_old/_backup20131011/fixedPosInterface.css deleted file mode 100644 index eb071f2..0000000 --- a/css_old/_backup20131011/fixedPosInterface.css +++ /dev/null @@ -1,329 +0,0 @@ -body { -/* This chops off any overhanging divs */ - overflow:hidden; -} - -.button { - display: table; -} - -/*#landscape {*/ - /*position:relative;*/ - /*width: 1024px;*/ - /*max-height: 768px;*/ - /*background-color: #808;*/ - /*border: 10px solid #ff0;*/ - /*margin: 0px auto;*/ -/*}*/ - - -#verticalShapes { - position:absolute; - right: -56px; - bottom: 15px; - /*background-color: #fff;*/ -} - -.verticalshape { - width: 50px; - height: 50px; - border: 2px solid #333; - border-radius: 0px 5px 5px 0px; - margin-top: 4px; - /*background-color: #f0f;*/ - cursor: pointer; -} - -.straight { - background: url('../img/vertical_shape_icons/straight.png') no-repeat; -} -.diverging { - background: url('../img/vertical_shape_icons/diverging.png') no-repeat; -} -.converging { - background: url('../img/vertical_shape_icons/converging.png') no-repeat; -} -.sinus { - background: url('../img/vertical_shape_icons/sinus.png') no-repeat; -} - - -/* Portrait */ -@media screen and (orientation:portrait) { - body { -/* background-color: #08F;*/ - } - - #landscape { - display: none; - } - #portrait { - display: block; - } -} - /* Landscape */ -@media screen and (orientation:landscape) { - body { -/* background-color: #8F0;*/ - } - - #landscape { - display: block; - } - #portrait { - display: none; - } -} - -.uiButtonsContainer { - position: fixed; - top: 0px; - left: 0px; - width: 1024px; - min-height: 500px; - max-height: 768px; - height: 100%; - /* height: 768px;*/ -} -.uiButtonsContainer:before { - content:' '; - display:block; - position:absolute; - left:0; - top:0; - right:0; - bottom:0; - border: 2px solid #333; -} - -#d3dlogo { - position: absolute; - top: 15px; - left: 31%; - width: 399px; - height: 139px; - background-image: url('../img/logo_full.png'); - cursor: pointer; -} - -#drawAreaContainer { - position: absolute; - top: 193px; - left: 193px; - width: 650px; - height: 450px; - background-color: #fff; - border: 4px solid #000; - border-radius: 15px; -} - -#preview_tmp { - position: absolute; - top: 0px; - left: 0px; - z-index: 500; - border: 1px solid #f80; - display: none; -} - -#mycanvas, #preview { - /*border: 1px solid #08c;*/ - float: left; -} - -#mycanvas { - width: 500px; - height: 450px; - border: 0px solid #333; - border-right: 2px solid #333; -} - -#preview { - /*border: 1px solid #f8c;*/ - position: absolute; - right: 0px; - top: 0px; - width: 150px; - height: 450px; -} - -.vertImage { - margin: 0px; - padding: 0px; - /*border: 2px solid #f0f;*/ - max-width: 100%; - height: auto; - width: auto; /* for ie9 */ -} - - -.bgTop { - position: absolute; - top: 0px; - left: 0px; - z-index: -5; -} -.bgMiddle { - display: block; - position: absolute; - top: 30%; - left: 0px; - z-index: -5; -} -.bgBottom { - position: absolute; - bottom: 0px; - left: 0px; - z-index: -5; -} - -/* PRINT PROGRESS DISPLAY */ -#printProgressContainer { - position: absolute; - right: 30px; - top: 370px; - width: 110px; - margin: 5px 0px; - font-weight: bold; - display:none; -} -#progressbarContainer { - margin: 3px 0px; - width: inherit; - height: 20px; - background-color: #fff; - border: 2px solid #333; - border-radius: 5px; - -o-border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} -.progressAmount { - margin: 0px 5px; -} -#progressbar { - position: relative; - /*margin-bottom: -20px;*/ - width: 0%; - height: 100%; - background-color: #4c4; - border: 0px solid #f0f; - border-radius: 3px; - -o-border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; -} - -/* THERMOMETER */ -#thermometerContainer { - position: absolute; - right: 5px; - top: 360px; -} -#thermometerCanvas { - /*background: #59b2b8;*/ - /*zoom: 2;*/ -} - - -/* The code below is for resizing UI elements as the viewport becomes less high (suitable for tablets & smartphones) */ - -@media screen and (max-height: 675px) { - .bgMiddle { - display: none; - } - - #d3dlogo { - width: 399px; - height: 74px; - background-image: url('../img/logo_small.png'); - margin-top: 9px; - } - - #btnsUpDown, #btnsTurnLeftRight { - zoom: 0.94; - -moz-transform: translate(0px,-5px) scale(.94); - } - - #btnNew { - zoom: 0.94; - -moz-transform: translate(-5px,-5px) scale(.94); - /*-moz-transform: translate(-3px,-3px);*/ - } - #btnOops { - zoom: 0.94; - -moz-transform: translate(-5px,-10px) scale(0.94); - } - - #btnPrint { - right: 10px; - top: 10px; - -moz-transform: translate(5px,-5px); - } - - - .btn { - zoom: 0.94; - -moz-transform: scale(.94); - } - - #drawAreaContainer { - top: 128px; - height: 350px; - } -} - -@media screen and (max-height: 560px) { - #d3dlogo { - width: 399px; - height: 57px; - background-image: url('../img/logo_smaller_wide.png'); - margin-top: 14px; - /*zoom: 0.8;*/ - /*-moz-transform: translate(-20px,-15px) scale(.8);*/ - /*-moz-transform: ;*/ - /*left: 34%;*/ - } - - #btnsUpDown, #btnsTurnLeftRight { - zoom: 0.86; - -moz-transform: translate(0px,-7px) scale(0.86); - } - - #btnPrint { - right: 6px; - -moz-transform: translate(10px,-10px); - } - - #btnNew { - zoom: 0.86; - -moz-transform: translate(-10px,-10px) scale(.86); - } - - .btn { - zoom: 0.86; - -moz-transform: scale(.86); - } - - #btnOops { - top: 350px; - zoom: 0.86; - -moz-transform: translate(-10px,-25px) scale(.86); - } - #btnSave { - -moz-transform: translate(-5px,-13px); - } - - #btnPrevious, #btnNext { - /*top: 200px;*/ - -moz-transform: translate(-5px,-10px); - } - - #drawAreaContainer { - top: 110px; - height: 350px; - } -} - - - diff --git a/css_old/_backup20131011/fixedPosInterface.css.BACKUP.99789.css b/css_old/_backup20131011/fixedPosInterface.css.BACKUP.99789.css deleted file mode 100644 index eb071f2..0000000 --- a/css_old/_backup20131011/fixedPosInterface.css.BACKUP.99789.css +++ /dev/null @@ -1,329 +0,0 @@ -body { -/* This chops off any overhanging divs */ - overflow:hidden; -} - -.button { - display: table; -} - -/*#landscape {*/ - /*position:relative;*/ - /*width: 1024px;*/ - /*max-height: 768px;*/ - /*background-color: #808;*/ - /*border: 10px solid #ff0;*/ - /*margin: 0px auto;*/ -/*}*/ - - -#verticalShapes { - position:absolute; - right: -56px; - bottom: 15px; - /*background-color: #fff;*/ -} - -.verticalshape { - width: 50px; - height: 50px; - border: 2px solid #333; - border-radius: 0px 5px 5px 0px; - margin-top: 4px; - /*background-color: #f0f;*/ - cursor: pointer; -} - -.straight { - background: url('../img/vertical_shape_icons/straight.png') no-repeat; -} -.diverging { - background: url('../img/vertical_shape_icons/diverging.png') no-repeat; -} -.converging { - background: url('../img/vertical_shape_icons/converging.png') no-repeat; -} -.sinus { - background: url('../img/vertical_shape_icons/sinus.png') no-repeat; -} - - -/* Portrait */ -@media screen and (orientation:portrait) { - body { -/* background-color: #08F;*/ - } - - #landscape { - display: none; - } - #portrait { - display: block; - } -} - /* Landscape */ -@media screen and (orientation:landscape) { - body { -/* background-color: #8F0;*/ - } - - #landscape { - display: block; - } - #portrait { - display: none; - } -} - -.uiButtonsContainer { - position: fixed; - top: 0px; - left: 0px; - width: 1024px; - min-height: 500px; - max-height: 768px; - height: 100%; - /* height: 768px;*/ -} -.uiButtonsContainer:before { - content:' '; - display:block; - position:absolute; - left:0; - top:0; - right:0; - bottom:0; - border: 2px solid #333; -} - -#d3dlogo { - position: absolute; - top: 15px; - left: 31%; - width: 399px; - height: 139px; - background-image: url('../img/logo_full.png'); - cursor: pointer; -} - -#drawAreaContainer { - position: absolute; - top: 193px; - left: 193px; - width: 650px; - height: 450px; - background-color: #fff; - border: 4px solid #000; - border-radius: 15px; -} - -#preview_tmp { - position: absolute; - top: 0px; - left: 0px; - z-index: 500; - border: 1px solid #f80; - display: none; -} - -#mycanvas, #preview { - /*border: 1px solid #08c;*/ - float: left; -} - -#mycanvas { - width: 500px; - height: 450px; - border: 0px solid #333; - border-right: 2px solid #333; -} - -#preview { - /*border: 1px solid #f8c;*/ - position: absolute; - right: 0px; - top: 0px; - width: 150px; - height: 450px; -} - -.vertImage { - margin: 0px; - padding: 0px; - /*border: 2px solid #f0f;*/ - max-width: 100%; - height: auto; - width: auto; /* for ie9 */ -} - - -.bgTop { - position: absolute; - top: 0px; - left: 0px; - z-index: -5; -} -.bgMiddle { - display: block; - position: absolute; - top: 30%; - left: 0px; - z-index: -5; -} -.bgBottom { - position: absolute; - bottom: 0px; - left: 0px; - z-index: -5; -} - -/* PRINT PROGRESS DISPLAY */ -#printProgressContainer { - position: absolute; - right: 30px; - top: 370px; - width: 110px; - margin: 5px 0px; - font-weight: bold; - display:none; -} -#progressbarContainer { - margin: 3px 0px; - width: inherit; - height: 20px; - background-color: #fff; - border: 2px solid #333; - border-radius: 5px; - -o-border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} -.progressAmount { - margin: 0px 5px; -} -#progressbar { - position: relative; - /*margin-bottom: -20px;*/ - width: 0%; - height: 100%; - background-color: #4c4; - border: 0px solid #f0f; - border-radius: 3px; - -o-border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; -} - -/* THERMOMETER */ -#thermometerContainer { - position: absolute; - right: 5px; - top: 360px; -} -#thermometerCanvas { - /*background: #59b2b8;*/ - /*zoom: 2;*/ -} - - -/* The code below is for resizing UI elements as the viewport becomes less high (suitable for tablets & smartphones) */ - -@media screen and (max-height: 675px) { - .bgMiddle { - display: none; - } - - #d3dlogo { - width: 399px; - height: 74px; - background-image: url('../img/logo_small.png'); - margin-top: 9px; - } - - #btnsUpDown, #btnsTurnLeftRight { - zoom: 0.94; - -moz-transform: translate(0px,-5px) scale(.94); - } - - #btnNew { - zoom: 0.94; - -moz-transform: translate(-5px,-5px) scale(.94); - /*-moz-transform: translate(-3px,-3px);*/ - } - #btnOops { - zoom: 0.94; - -moz-transform: translate(-5px,-10px) scale(0.94); - } - - #btnPrint { - right: 10px; - top: 10px; - -moz-transform: translate(5px,-5px); - } - - - .btn { - zoom: 0.94; - -moz-transform: scale(.94); - } - - #drawAreaContainer { - top: 128px; - height: 350px; - } -} - -@media screen and (max-height: 560px) { - #d3dlogo { - width: 399px; - height: 57px; - background-image: url('../img/logo_smaller_wide.png'); - margin-top: 14px; - /*zoom: 0.8;*/ - /*-moz-transform: translate(-20px,-15px) scale(.8);*/ - /*-moz-transform: ;*/ - /*left: 34%;*/ - } - - #btnsUpDown, #btnsTurnLeftRight { - zoom: 0.86; - -moz-transform: translate(0px,-7px) scale(0.86); - } - - #btnPrint { - right: 6px; - -moz-transform: translate(10px,-10px); - } - - #btnNew { - zoom: 0.86; - -moz-transform: translate(-10px,-10px) scale(.86); - } - - .btn { - zoom: 0.86; - -moz-transform: scale(.86); - } - - #btnOops { - top: 350px; - zoom: 0.86; - -moz-transform: translate(-10px,-25px) scale(.86); - } - #btnSave { - -moz-transform: translate(-5px,-13px); - } - - #btnPrevious, #btnNext { - /*top: 200px;*/ - -moz-transform: translate(-5px,-10px); - } - - #drawAreaContainer { - top: 110px; - height: 350px; - } -} - - - diff --git a/css_old/_backup20131011/fixedPosInterface.css.BASE.99789.css b/css_old/_backup20131011/fixedPosInterface.css.BASE.99789.css deleted file mode 100644 index 426497d..0000000 --- a/css_old/_backup20131011/fixedPosInterface.css.BASE.99789.css +++ /dev/null @@ -1,323 +0,0 @@ -body { -/* This chops off any overhanging divs */ - overflow:hidden; -} - - -.button { - display: table; -} - -/*.big {*/ - /*background: #a6e19c;*/ - /*border: 1px solid #222;*/ - /*height: 64px;*/ - /*width: 64px;*/ - /*display: table-cell;*/ - /*vertical-align: middle;*/ - /*text-align: center;*/ - /*border-radius: 32px;*/ - /*-moz-border-radius: 32px;*/ - /*-webkit-border-radius: 32px;*/ -/*}*/ -/*.small {*/ - /*background: #a3d5f7;*/ - /*border: 1px solid #222;*/ - /*height: 40px;*/ - /*width: 40px;*/ - /*display: table-cell;*/ - /*vertical-align: middle;*/ - /*text-align: center;*/ - /*border-radius: 20px;*/ - /*-moz-border-radius: 20px;*/ - /*-webkit-border-radius: 20px;*/ -/*}*/ - -#logo { - position: absolute; - /*left: 50%;*/ - /*margin-left: -220px;*/ - top: 20px; - left: 315px; - width: 400px; - height: 140px; -} - -/*ha {*/ - /*background: #f5f5f5 url('../images/bg.jpg') no-repeat;*/ -/*}*/ - - /* Portrait */ -@media screen and (orientation:portrait) { - body { -/* background-color: #08F;*/ - } - - #landscape { - display: none; - } - #portrait { - display: block; - } -} - /* Landscape */ -@media screen and (orientation:landscape) { - body { -/* background-color: #8F0;*/ - } - - #landscape { - display: block; - } - #portrait { - display: none; - } -} - -.container { - position: fixed; - top: 0px; - left: 0px; - border: 2px solid #333; - width: 1024px; - min-height: 500px; - max-height: 768px; - height: 100%; -/* height: 768px;*/ -} - -#d3dlogo { - position: absolute; - top: 15px; - left: 31%; - width: 399px; - height: 139px; - background-image: url('../img/logo_full.png'); - cursor: pointer; -} - -#svg { - cursor: pointer; -} - -#drawAreaContainer { - position: absolute; - top: 193px; - left: 193px; - width: 650px; - height: 450px; - background-color: #fff; - border: 4px solid #000; - border-radius: 15px; -} - -#preview_tmp { - position: absolute; - top: 0px; - left: 0px; - z-index: 500; - border: 1px solid #f80; - display: none; -} - -#mycanvas, #preview { - /*border: 1px solid #08c;*/ - float: left; -} - -#mycanvas { - width: 500px; - height: 450px; - border: 0px solid #333; - border-right: 2px solid #333; -} - -#preview { - /*border: 1px solid #f8c;*/ - position: absolute; - right: 0px; - top: 0px; - width: 150px; - height: 450px; -} - -.vertImage { - margin: 0px; - padding: 0px; - /*border: 2px solid #f0f;*/ - max-width: 100%; - height: auto; - width: auto; /* for ie9 */ -} - - -.bgTop { - position: absolute; - top: 0px; - left: 0px; - z-index: -5; -} -.bgMiddle { - display: block; - position: absolute; - top: 30%; - left: 0px; - z-index: -5; -} -.bgBottom { - position: absolute; - bottom: 0px; - left: 0px; - z-index: -5; -} - -/* PRINT PROGRESS DISPLAY */ -#printProgressContainer { - position: absolute; - right: 30px; - top: 370px; - width: 110px; - margin: 5px 0px; - font-weight: bold; - display:none; -} -#progressbarContainer { - margin: 3px 0px; - width: inherit; - height: 20px; - background-color: #fff; - border: 2px solid #333; - border-radius: 5px; - -o-border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} -.progressAmount { - margin: 0px 5px; -} -#progressbar { - position: relative; - /*margin-bottom: -20px;*/ - width: 0%; - height: 100%; - background-color: #4c4; - border: 0px solid #f0f; - border-radius: 3px; - -o-border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; -} - -/* THERMOMETER */ -#thermometerContainer { - position: absolute; - right: 25px; - top: 370px; -} -#thermometerCanvas { - /*background: #59b2b8;*/ - /*zoom: 2;*/ -} - - -/* The code below is for resizing UI elements as the viewport becomes less high (suitable for tablets & smartphones) */ - -@media screen and (max-height: 675px) { - .bgMiddle { - display: none; - } - - #d3dlogo { - width: 399px; - height: 74px; - background-image: url('../img/logo_small.png'); - margin-top: 9px; - } - - #btnsUpDown, #btnsTurnLeftRight { - zoom: 0.94; - -moz-transform: translate(0px,-5px) scale(.94); - } - - #btnNew { - zoom: 0.94; - -moz-transform: translate(-5px,-5px) scale(.94); - /*-moz-transform: translate(-3px,-3px);*/ - } - #btnOops { - zoom: 0.94; - -moz-transform: translate(-5px,-10px) scale(0.94); - } - - #btnPrint { - right: 10px; - top: 10px; - -moz-transform: translate(5px,-5px); - } - - - .btn { - zoom: 0.94; - -moz-transform: scale(.94); - } - - #drawAreaContainer { - top: 128px; - height: 350px; - } -} - -@media screen and (max-height: 560px) { - #d3dlogo { - width: 399px; - height: 57px; - background-image: url('../img/logo_smaller_wide.png'); - margin-top: 14px; - /*zoom: 0.8;*/ - /*-moz-transform: translate(-20px,-15px) scale(.8);*/ - /*-moz-transform: ;*/ - /*left: 34%;*/ - } - - #btnsUpDown, #btnsTurnLeftRight { - zoom: 0.86; - -moz-transform: translate(0px,-7px) scale(0.86); - } - - #btnPrint { - right: 6px; - -moz-transform: translate(10px,-10px); - } - - #btnNew { - zoom: 0.86; - -moz-transform: translate(-10px,-10px) scale(.86); - } - - .btn { - zoom: 0.86; - -moz-transform: scale(.86); - } - - #btnOops { - top: 350px; - zoom: 0.86; - -moz-transform: translate(-10px,-25px) scale(.86); - } - #btnSave { - -moz-transform: translate(-5px,-13px); - } - - #btnPrevious, #btnNext { - /*top: 200px;*/ - -moz-transform: translate(-5px,-10px); - } - - #drawAreaContainer { - top: 110px; - height: 350px; - } -} - - - diff --git a/css_old/_backup20131011/fixedPosInterface.css.LOCAL.99789.css b/css_old/_backup20131011/fixedPosInterface.css.LOCAL.99789.css deleted file mode 100644 index eb071f2..0000000 --- a/css_old/_backup20131011/fixedPosInterface.css.LOCAL.99789.css +++ /dev/null @@ -1,329 +0,0 @@ -body { -/* This chops off any overhanging divs */ - overflow:hidden; -} - -.button { - display: table; -} - -/*#landscape {*/ - /*position:relative;*/ - /*width: 1024px;*/ - /*max-height: 768px;*/ - /*background-color: #808;*/ - /*border: 10px solid #ff0;*/ - /*margin: 0px auto;*/ -/*}*/ - - -#verticalShapes { - position:absolute; - right: -56px; - bottom: 15px; - /*background-color: #fff;*/ -} - -.verticalshape { - width: 50px; - height: 50px; - border: 2px solid #333; - border-radius: 0px 5px 5px 0px; - margin-top: 4px; - /*background-color: #f0f;*/ - cursor: pointer; -} - -.straight { - background: url('../img/vertical_shape_icons/straight.png') no-repeat; -} -.diverging { - background: url('../img/vertical_shape_icons/diverging.png') no-repeat; -} -.converging { - background: url('../img/vertical_shape_icons/converging.png') no-repeat; -} -.sinus { - background: url('../img/vertical_shape_icons/sinus.png') no-repeat; -} - - -/* Portrait */ -@media screen and (orientation:portrait) { - body { -/* background-color: #08F;*/ - } - - #landscape { - display: none; - } - #portrait { - display: block; - } -} - /* Landscape */ -@media screen and (orientation:landscape) { - body { -/* background-color: #8F0;*/ - } - - #landscape { - display: block; - } - #portrait { - display: none; - } -} - -.uiButtonsContainer { - position: fixed; - top: 0px; - left: 0px; - width: 1024px; - min-height: 500px; - max-height: 768px; - height: 100%; - /* height: 768px;*/ -} -.uiButtonsContainer:before { - content:' '; - display:block; - position:absolute; - left:0; - top:0; - right:0; - bottom:0; - border: 2px solid #333; -} - -#d3dlogo { - position: absolute; - top: 15px; - left: 31%; - width: 399px; - height: 139px; - background-image: url('../img/logo_full.png'); - cursor: pointer; -} - -#drawAreaContainer { - position: absolute; - top: 193px; - left: 193px; - width: 650px; - height: 450px; - background-color: #fff; - border: 4px solid #000; - border-radius: 15px; -} - -#preview_tmp { - position: absolute; - top: 0px; - left: 0px; - z-index: 500; - border: 1px solid #f80; - display: none; -} - -#mycanvas, #preview { - /*border: 1px solid #08c;*/ - float: left; -} - -#mycanvas { - width: 500px; - height: 450px; - border: 0px solid #333; - border-right: 2px solid #333; -} - -#preview { - /*border: 1px solid #f8c;*/ - position: absolute; - right: 0px; - top: 0px; - width: 150px; - height: 450px; -} - -.vertImage { - margin: 0px; - padding: 0px; - /*border: 2px solid #f0f;*/ - max-width: 100%; - height: auto; - width: auto; /* for ie9 */ -} - - -.bgTop { - position: absolute; - top: 0px; - left: 0px; - z-index: -5; -} -.bgMiddle { - display: block; - position: absolute; - top: 30%; - left: 0px; - z-index: -5; -} -.bgBottom { - position: absolute; - bottom: 0px; - left: 0px; - z-index: -5; -} - -/* PRINT PROGRESS DISPLAY */ -#printProgressContainer { - position: absolute; - right: 30px; - top: 370px; - width: 110px; - margin: 5px 0px; - font-weight: bold; - display:none; -} -#progressbarContainer { - margin: 3px 0px; - width: inherit; - height: 20px; - background-color: #fff; - border: 2px solid #333; - border-radius: 5px; - -o-border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} -.progressAmount { - margin: 0px 5px; -} -#progressbar { - position: relative; - /*margin-bottom: -20px;*/ - width: 0%; - height: 100%; - background-color: #4c4; - border: 0px solid #f0f; - border-radius: 3px; - -o-border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; -} - -/* THERMOMETER */ -#thermometerContainer { - position: absolute; - right: 5px; - top: 360px; -} -#thermometerCanvas { - /*background: #59b2b8;*/ - /*zoom: 2;*/ -} - - -/* The code below is for resizing UI elements as the viewport becomes less high (suitable for tablets & smartphones) */ - -@media screen and (max-height: 675px) { - .bgMiddle { - display: none; - } - - #d3dlogo { - width: 399px; - height: 74px; - background-image: url('../img/logo_small.png'); - margin-top: 9px; - } - - #btnsUpDown, #btnsTurnLeftRight { - zoom: 0.94; - -moz-transform: translate(0px,-5px) scale(.94); - } - - #btnNew { - zoom: 0.94; - -moz-transform: translate(-5px,-5px) scale(.94); - /*-moz-transform: translate(-3px,-3px);*/ - } - #btnOops { - zoom: 0.94; - -moz-transform: translate(-5px,-10px) scale(0.94); - } - - #btnPrint { - right: 10px; - top: 10px; - -moz-transform: translate(5px,-5px); - } - - - .btn { - zoom: 0.94; - -moz-transform: scale(.94); - } - - #drawAreaContainer { - top: 128px; - height: 350px; - } -} - -@media screen and (max-height: 560px) { - #d3dlogo { - width: 399px; - height: 57px; - background-image: url('../img/logo_smaller_wide.png'); - margin-top: 14px; - /*zoom: 0.8;*/ - /*-moz-transform: translate(-20px,-15px) scale(.8);*/ - /*-moz-transform: ;*/ - /*left: 34%;*/ - } - - #btnsUpDown, #btnsTurnLeftRight { - zoom: 0.86; - -moz-transform: translate(0px,-7px) scale(0.86); - } - - #btnPrint { - right: 6px; - -moz-transform: translate(10px,-10px); - } - - #btnNew { - zoom: 0.86; - -moz-transform: translate(-10px,-10px) scale(.86); - } - - .btn { - zoom: 0.86; - -moz-transform: scale(.86); - } - - #btnOops { - top: 350px; - zoom: 0.86; - -moz-transform: translate(-10px,-25px) scale(.86); - } - #btnSave { - -moz-transform: translate(-5px,-13px); - } - - #btnPrevious, #btnNext { - /*top: 200px;*/ - -moz-transform: translate(-5px,-10px); - } - - #drawAreaContainer { - top: 110px; - height: 350px; - } -} - - - diff --git a/css_old/_backup20131011/fixedPosInterface.css.REMOTE.99789.css b/css_old/_backup20131011/fixedPosInterface.css.REMOTE.99789.css deleted file mode 100644 index e69de29..0000000 diff --git a/css_old/_backup20131011/popups.css b/css_old/_backup20131011/popups.css deleted file mode 100644 index ce17655..0000000 --- a/css_old/_backup20131011/popups.css +++ /dev/null @@ -1,74 +0,0 @@ -#contentOverlay { - background-color: rgba(255, 255, 255, 0.65); - z-index: 10; - position: absolute; - top: 0px; - left: 0px; - width: 1024px; - height: 100%; - display:none; -} - -.popup { - background-color: #fff; - z-index: 15; - - position: absolute; - top: 50%; - left: 50%; - width: 835px; - height: 500px; - margin: -250px 0 0 -417.5px; - /*padding: 25px;*/ - - /*overflow: scroll;*/ - /*overflow-y: hidden;*/ - -moz-box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65); - -webkit-box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65); - box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65); - border: 2px solid #222; - border-radius: 15px; - -moz-border-radius: 15px; - -webkit-border-radius: 15px; - overflow: hidden; - display:none; -} - - -#settings header { - margin: 25px 25px 0 25px; - height: 44px; -} -#settings div.content { - margin: 15px 25px 25px 25px; - height: 388px; - display: table; -} -#settings div.content > div { - height: 100%; -} -#settings div.content > div.settings { - border: 1px solid rgb(187, 187, 187); - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - - width: 660px; - overflow: scroll; - max-height: 368px; - overflow-x: hidden; - padding: 10px 10px 10px 10px; -} -#settings div.content > div.manipulationBtns { - display: table-cell; - vertical-align: bottom; - width: 125px; - -} -#settings div.content .btnOK { - width: 85px; - height: 86px; - background: url('../img/buttons/btnOk_settings.png') no-repeat; - margin: 0 0 0 10px; - cursor: pointer; -} \ No newline at end of file diff --git a/css_old/_settings.css b/css_old/_settings.css deleted file mode 100644 index 7c6112c..0000000 --- a/css_old/_settings.css +++ /dev/null @@ -1,96 +0,0 @@ -form { - margin: 10px; -} -form input { - margin: 1px; -} - -body,th,td { - font-family: Helvetica, Arial, "Nimbus Sans L", sans-serif; - font-size: 13px; -} -.settingsContainer { - position:relative; - max-width: 600px; - /*min-width: 370px;*/ - width: 100%; - height: 100%; -} -/*form#settingsForm {*/ - /*width: 100% auto;*/ -/*}*/ -form fieldset { - max-width: 600px; - border: 1px solid rgb(187, 187, 187); - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - margin-bottom: 20px; - padding: 8px; - /*padding-right: 8px;*/ -} -form fieldset fieldset{ - max-width: 580px; - margin: 15px 0 5px 0; - clear: left; - float: left; -} -form fieldset legend { - margin-left: 10px; - font-weight: bold; -} -form label { - min-width: 150px; - display: block; - float: left; - margin: 1px 0 0 0; - clear: left; -} -form div { - float: left; -} -form input[type="text"], form input[type="number"], form input[type="password"] { - border: 1px solid rgb(144, 192, 255); - margin-right: 5px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -form input[type="text"].small, form input[type="number"].small, form input[type="password"].small { - width: 50px; -} -form input[type="text"].large, form input[type="number"].large, form input[type="password"].large { - width: 250px; -} -form input[type="radio"] { - margin: 4px 4px 0 0; -} - -form textarea { - border: 1px solid rgb(144, 192, 255); - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -form .startgcode_left { - float:left; - margin-right: 20px; -} -form textarea.gcode { - width: 252px; - /*max-width: 262px;*/ - /*min-width: 200px;*/ - height: 150px; -} -form small { - margin: 3px 0 0 0; - display: block; - clear: left; -} -form .button { - display: inline-block; -} - -form #passwordLabel, form #password { - display: none; -} \ No newline at end of file diff --git a/img_old/bg_vertical.jpg b/img_old/bg_vertical.jpg deleted file mode 100755 index e71bc82..0000000 Binary files a/img_old/bg_vertical.jpg and /dev/null differ diff --git a/img_old/icon.png b/img_old/icon.png deleted file mode 100755 index 434f30f..0000000 Binary files a/img_old/icon.png and /dev/null differ diff --git a/img_old/logo/logo_full.png b/img_old/logo/logo_full.png deleted file mode 100755 index 47415d8..0000000 Binary files a/img_old/logo/logo_full.png and /dev/null differ diff --git a/img_old/logo/logo_full_8bit.png b/img_old/logo/logo_full_8bit.png deleted file mode 100644 index adba35c..0000000 Binary files a/img_old/logo/logo_full_8bit.png and /dev/null differ diff --git a/img_old/logo/logo_small BACKUP.png b/img_old/logo/logo_small BACKUP.png deleted file mode 100644 index 372b5ee..0000000 Binary files a/img_old/logo/logo_small BACKUP.png and /dev/null differ diff --git a/img_old/logo/logo_small.png b/img_old/logo/logo_small.png deleted file mode 100644 index 1ea8163..0000000 Binary files a/img_old/logo/logo_small.png and /dev/null differ diff --git a/img_old/logo/logo_small_8bit.png b/img_old/logo/logo_small_8bit.png deleted file mode 100644 index a2c0189..0000000 Binary files a/img_old/logo/logo_small_8bit.png and /dev/null differ diff --git a/img_old/logo/logo_smaller.png b/img_old/logo/logo_smaller.png deleted file mode 100644 index f000e5c..0000000 Binary files a/img_old/logo/logo_smaller.png and /dev/null differ diff --git a/img_old/logo/logo_smaller_8bit.png b/img_old/logo/logo_smaller_8bit.png deleted file mode 100644 index bd85479..0000000 Binary files a/img_old/logo/logo_smaller_8bit.png and /dev/null differ diff --git a/img_old/logo/logo_smaller_wide.png b/img_old/logo/logo_smaller_wide.png deleted file mode 100644 index 25ae4c8..0000000 Binary files a/img_old/logo/logo_smaller_wide.png and /dev/null differ diff --git a/img_old/logo/logo_smaller_wide_8bit.png b/img_old/logo/logo_smaller_wide_8bit.png deleted file mode 100644 index ef193ab..0000000 Binary files a/img_old/logo/logo_smaller_wide_8bit.png and /dev/null differ diff --git a/img_old/logo/logo_smallest.png b/img_old/logo/logo_smallest.png deleted file mode 100644 index 17f2799..0000000 Binary files a/img_old/logo/logo_smallest.png and /dev/null differ diff --git a/img_old/logo/logo_smallest_wide.png b/img_old/logo/logo_smallest_wide.png deleted file mode 100644 index c3f2fa1..0000000 Binary files a/img_old/logo/logo_smallest_wide.png and /dev/null differ diff --git a/img_old/thermo_bg_2.png b/img_old/thermo_bg_2.png deleted file mode 100644 index 8e3a979..0000000 Binary files a/img_old/thermo_bg_2.png and /dev/null differ diff --git a/img_old/thermo_fg_2.png b/img_old/thermo_fg_2.png deleted file mode 100644 index fc14ec4..0000000 Binary files a/img_old/thermo_fg_2.png and /dev/null differ diff --git a/img_old/webpage_icons/apple-touch-icon-114x114-precomposed.png b/img_old/webpage_icons/apple-touch-icon-114x114-precomposed.png deleted file mode 100644 index 50e1053..0000000 Binary files a/img_old/webpage_icons/apple-touch-icon-114x114-precomposed.png and /dev/null differ diff --git a/img_old/webpage_icons/apple-touch-icon-144x144-precomposed.png b/img_old/webpage_icons/apple-touch-icon-144x144-precomposed.png deleted file mode 100644 index 585036f..0000000 Binary files a/img_old/webpage_icons/apple-touch-icon-144x144-precomposed.png and /dev/null differ diff --git a/img_old/webpage_icons/apple-touch-icon-72x72-precomposed.png b/img_old/webpage_icons/apple-touch-icon-72x72-precomposed.png deleted file mode 100644 index f422615..0000000 Binary files a/img_old/webpage_icons/apple-touch-icon-72x72-precomposed.png and /dev/null differ diff --git a/img_old/webpage_icons/apple-touch-icon-precomposed.png b/img_old/webpage_icons/apple-touch-icon-precomposed.png deleted file mode 100644 index 333520f..0000000 Binary files a/img_old/webpage_icons/apple-touch-icon-precomposed.png and /dev/null differ diff --git a/js_src/Button.js b/js/Button.js similarity index 98% rename from js_src/Button.js rename to js/Button.js index ea3a3ad..3afc06c 100644 --- a/js_src/Button.js +++ b/js/Button.js @@ -12,7 +12,7 @@ var _timer = undefined; var _x,_y; var isDown = false; - var hoi = "fijn"; + // var hoi = "fijn"; var updateCursor = function(e) { // console.log(e.offsetX); diff --git a/js_src/Class.js b/js/Class.js similarity index 100% rename from js_src/Class.js rename to js/Class.js diff --git a/js_src/Help.js b/js/Help.js similarity index 100% rename from js_src/Help.js rename to js/Help.js diff --git a/js_src/Keyboard.js b/js/Keyboard.js similarity index 100% rename from js_src/Keyboard.js rename to js/Keyboard.js diff --git a/js_src/Message.js b/js/Message.js similarity index 100% rename from js_src/Message.js rename to js/Message.js diff --git a/js_src/Popup.js b/js/Popup.js similarity index 100% rename from js_src/Popup.js rename to js/Popup.js diff --git a/js_src/Printer.js b/js/Printer.js similarity index 100% rename from js_src/Printer.js rename to js/Printer.js diff --git a/js_src/PrinterPanel.js b/js/PrinterPanel.js similarity index 100% rename from js_src/PrinterPanel.js rename to js/PrinterPanel.js diff --git a/js_src/Progressbar.js b/js/Progressbar.js similarity index 100% rename from js_src/Progressbar.js rename to js/Progressbar.js diff --git a/js_src/SettingsWindow.js b/js/SettingsWindow.js similarity index 100% rename from js_src/SettingsWindow.js rename to js/SettingsWindow.js diff --git a/js_src/Shape.js b/js/Shape.js similarity index 100% rename from js_src/Shape.js rename to js/Shape.js diff --git a/js_src/Svg.js b/js/Svg.js similarity index 100% rename from js_src/Svg.js rename to js/Svg.js diff --git a/js_src/Thermometer.js b/js/Thermometer.js similarity index 100% rename from js_src/Thermometer.js rename to js/Thermometer.js diff --git a/js_src/UpdatePanel.js b/js/UpdatePanel.js similarity index 100% rename from js_src/UpdatePanel.js rename to js/UpdatePanel.js diff --git a/js_src/WordArt.js b/js/WordArt.js similarity index 79% rename from js_src/WordArt.js rename to js/WordArt.js index f668678..72bf59c 100644 --- a/js_src/WordArt.js +++ b/js/WordArt.js @@ -80,22 +80,6 @@ function getPathFromChar(ch) { return $("#svgfont path")[index].attributes["d"].nodeValue; } -// function translatePoints(points,x,y) { -// for (var i=0; i55) previewDown(true); + function onBtnDown(e) { + previewDown(true); } - function onBtnTwist(e,cursor) { - if (cursor.y<25) previewTwistRight(true); - else if (cursor.y>55) previewTwistLeft(true); + function onBtnTwistLeft(e) { + previewTwistLeft(true); + } + + function onBtnTwistRight(e) { + previewTwistRight(true); } function onBtnOops(e) { diff --git a/js_src/canvasDrawing.js b/js/canvasDrawing.js similarity index 100% rename from js_src/canvasDrawing.js rename to js/canvasDrawing.js diff --git a/js_src/d3dServerInterfacing.js b/js/d3dServerInterfacing.js similarity index 100% rename from js_src/d3dServerInterfacing.js rename to js/d3dServerInterfacing.js diff --git a/js_src/gcodeGenerating.js b/js/gcodeGenerating.js similarity index 100% rename from js_src/gcodeGenerating.js rename to js/gcodeGenerating.js diff --git a/js_src/init_layout.js b/js/init_layout.js similarity index 100% rename from js_src/init_layout.js rename to js/init_layout.js diff --git a/js_src/libs/FileSaver.js b/js/libs/FileSaver.js similarity index 100% rename from js_src/libs/FileSaver.js rename to js/libs/FileSaver.js diff --git a/js_src/libs/jquery-1-9-1.js b/js/libs/jquery-1-9-1.js similarity index 100% rename from js_src/libs/jquery-1-9-1.js rename to js/libs/jquery-1-9-1.js diff --git a/js_src/libs/jquery-cookie.js b/js/libs/jquery-cookie.js similarity index 100% rename from js_src/libs/jquery-cookie.js rename to js/libs/jquery-cookie.js diff --git a/js_src/libs/jquery-coolfieldset.js b/js/libs/jquery-coolfieldset.js similarity index 100% rename from js_src/libs/jquery-coolfieldset.js rename to js/libs/jquery-coolfieldset.js diff --git a/js_src/libs/jquery-fastclick.js b/js/libs/jquery-fastclick.js similarity index 100% rename from js_src/libs/jquery-fastclick.js rename to js/libs/jquery-fastclick.js diff --git a/js_src/libs/jquery-joyride-2-1.js b/js/libs/jquery-joyride-2-1.js similarity index 100% rename from js_src/libs/jquery-joyride-2-1.js rename to js/libs/jquery-joyride-2-1.js diff --git a/js_src/main.js b/js/main.js similarity index 100% rename from js_src/main.js rename to js/main.js diff --git a/js_src/previewRendering.js b/js/previewRendering.js similarity index 100% rename from js_src/previewRendering.js rename to js/previewRendering.js diff --git a/js_src/sidebar.js b/js/sidebar.js similarity index 100% rename from js_src/sidebar.js rename to js/sidebar.js diff --git a/js_src/sketches.js b/js/sketches.js similarity index 100% rename from js_src/sketches.js rename to js/sketches.js diff --git a/js_src/utils.js b/js/utils.js similarity index 100% rename from js_src/utils.js rename to js/utils.js diff --git a/js_src/verticalShapes.js b/js/verticalShapes.js similarity index 100% rename from js_src/verticalShapes.js rename to js/verticalShapes.js diff --git a/js_old/Thermometer.js.orig b/js_old/Thermometer.js.orig deleted file mode 100644 index 54a708e..0000000 --- a/js_old/Thermometer.js.orig +++ /dev/null @@ -1,136 +0,0 @@ -<<<<<<< HEAD -======= -var $displayThermometer = $("#thermometerContainer"); - - -//TODO 2013-09-18 allow displaying temperatures HIGHER than the targTemp (it's now being capped at targTemp). ->>>>>>> new_layouting_approach -function Thermometer() { - this.currentTemperature = 0; // default val - this.targetTemperature = 180; // default val - - this.thermoOverlayImg = new Image(); - this.thermoOverlayImgSrc = "img/thermometer_fg_overlay.png"; // ../img/thermometer_fg_overlay.png - - this.thermoWidth= 40; - this.thermoHeight = 100; - - this.$canvas; - this.canvas; - this.context; - this.$container; - - this.isInitted = false; - - this.enabled = true; - - this.thermoColors = [ - [50, 200, 244], // 'cold' - [244, 190, 10], // 'warming up' - [244, 50, 50] // 'ready / hot' - ]; - - this.init = function(targCanvas, targCanvasContainer) { - console.log("Thermometer.init()"); - - this.$container = targCanvasContainer; - - this.$canvas = targCanvas; - this.canvas = this.$canvas[0]; - this.context = this.canvas.getContext('2d'); - - - var self = this; - this.thermoOverlayImg.onload = function() { - console.log("canvasThermoOverlay img loaded"); - self.isInitted = true; - self.update(self.currentTemperature, self.targetTemperature); - }; - this.thermoOverlayImg.src = this.thermoOverlayImgSrc; - } - - this.update = function(curr, targ) { - // console.log("Thermometer.update(" + curr + "," + targ + ")"); - - if (this.isInitted) { - if(!this.enabled) return; - if (curr == undefined) curr = 0; - if (targ== undefined) targ = 180; // prevent divide by zero - - var progress = curr / targ; - - progress = Math.min(progress, 1.0); - progress = Math.max(progress, 0); - - var h = this.thermoHeight; // 94 // px - var paddingUnder = 15; // how far is beginpoint from bottom of thermometer - var paddingAbove = 25; // how far is endpoint from top of thermometer - var endPoint = h * .8; - var p = Math.floor((h - paddingUnder - paddingAbove) * progress); // % - // var tempHeight = - - var currColor = this.thermoColors[0]; - if (progress > 0.98) { - currColor = this.thermoColors[2]; - } else if (progress > 0.25) { - currColor = this.thermoColors[1]; - } - - // clear - this.context.clearRect(0, 0, this.canvas.width, this.canvas.height); - this.context.font = "10pt sans-serif"; - - // draw the thermometer clipping path - this.context.save(); - this.context.beginPath(); - this.context.arc(40, 80, 16, 0, 2 * Math.PI, false); // circle bottom of thermometer - this.context.arc(40, 10, 4, 0, 2 * Math.PI, false); // circle at top of thermometer tube - this.context.rect(36, 11, 8, 70); // thermometer tube - this.context.fillStyle = '#fff'; - this.context.fill(); - this.context.clip(); - - // draw rectangle which represents temperature - // rect will be clipped by the thermometer outlines - this.context.beginPath(); - this.context.rect(20, h - paddingUnder - p, 60, p + paddingUnder); - //console.log(" currColor: " + currColor); - //todo Math.floor?? - this.context.fillStyle = "rgb(" + currColor[0] + "," + currColor[1] + "," + currColor[2] + ")"; - this.context.fill(); - this.context.restore(); - - // additional text labels - this.context.save(); - this.context.beginPath(); - this.context.moveTo(32, paddingAbove); - this.context.lineTo(52, paddingAbove); - this.context.lineWidth = 2; - this.context.strokeStyle = '#000'; - this.context.stroke(); - this.context.fillStyle = '#000'; - this.context.textAlign = "left"; - this.context.textBaseline = "middle"; - this.context.fillText(targ + "°", 55, paddingAbove); - this.context.restore(); - - // the thermometer outline png - this.context.drawImage(this.thermoOverlayImg, 20, 0); - - // text - this.context.fillStyle = '#000'; - this.context.textAlign="center"; - this.context.fillText(curr + "°", 40, h + paddingUnder); - } else { - console.log("Thermometer.setTemperature() -> thermometer not initialized!"); - } - } - this.show = function() { - this.$container.show(); - this.enabled = true; - } - this.hide = function() { - this.$container.hide(); - this.enabled = false; - } -} diff --git a/js_old/init_layout backup20130918.js b/js_old/init_layout backup20130918.js deleted file mode 100644 index a535412..0000000 --- a/js_old/init_layout backup20130918.js +++ /dev/null @@ -1,260 +0,0 @@ -var imgDims = [320, 320]; // width and height of image - -function doClientAndOrientationStuff() { - console.log("f:doClientAndOrientationStuff()"); - - $(".agentInfo").text(""); - - /* - if( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) { - if (window.orientation == -90 || window.orientation == 90) { - // landscape -// $('#Viewport').attr('content', 'width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=yes'); - } else { - // portrait - $('#Viewport').attr('content', 'width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=yes'); - } - } - return; - //*/ - - if( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) { - console.log("PHONE OR TABLET! --> window.orientation = " + window.orientation); - if (window.orientation == -90 || window.orientation == 90) { - console.log(" landscape"); - // landscape - - // var ww = ( $(window).width() < window.screen.width ) ? $(window).width() : window.screen.width; //get proper width - var ww = 0; //get proper width - if (window.innerWidth) { - ww = window.innerWidth; - // if (window.screen.availWidth) { -// ww = window.screen.availWidth; - -// if( /iPhone|iPad|iPod/i.test(navigator.userAgent) ) { -// ww = window.innerWidth; -// } - } else if($(window).width()) { - ww = $(window).width(); - } else { - - } - - // ww = 480; - - var mw = imgDims[0]; // min width of site - //* - if( /iPhone|iPad|iPod/i.test(navigator.userAgent) ) { - var mw = imgDims[1]; // in landscape: min-width is image width - } - //*/ - var ratio = ww / mw; //calculate ratio - $('#Viewport').attr('content', 'initial-scale='+ratio+',maximum-scale='+ratio+',minimum-scale='+ratio+',user-scalable=no,width='+mw); - if( ww < mw){ //smaller than minimum size -// $(".colmask").css("background-color", "#ff0"); - // $('#Viewport').attr('content', 'initial-scale=' + ratio + ', maximum-scale=' + ratio + ', minimum-scale=' + ratio + ', user-scalable=yes, width=' + ww); - // $('#Viewport').attr('content', 'initial-scale=1.0, maximum-scale=2, minimum-scale=1.0, user-scalable=yes, width=' + ww); - }else{ //regular size -// $(".colmask").css("background-color", "#0ff"); - // $('#Viewport').attr('content', 'initial-scale=1.0, maximum-scale=2, minimum-scale=1.0, user-scalable=yes, width=' + ww); - } - - console.log(" ww: " + ww + ", mw: " + mw + ", ratio: " + ratio); - - $(".agentInfo").append("ww: " + ww + ", mw: " + mw + "
"); - $(".agentInfo").append("ratio: " + ratio + "
"); - $(".agentInfo").append("
"); - } else { - console.log(" portrait"); - // portrait -// $('#Viewport').attr('content', 'initial-scale='+1+',maximum-scale='+1+',minimum-scale='+1+',user-scalable=no'); - $('#Viewport').attr('content', 'width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no'); - } - - } else { - // console.log("else"); - $(".colmask").css("background-color", "#f80"); - - } - - - $(".agentInfo").append("$(window).width(): " + $(window).width() + "
"); - $(".agentInfo").append("window.screen.width: " + window.screen.width+ "
"); - $(".agentInfo").append("window.screen.availWidth: " + window.screen.availWidth+ "
"); - $(".agentInfo").append("
"); - $(".agentInfo").append("window.innerWidth: " + window.innerWidth + "
"); - $(".agentInfo").append("window.innerHeight: " + window.innerHeight + "
"); - $(".agentInfo").append("
"); - $(".agentInfo").append("$(window).height(): " + $(window).height() + "
"); - $(".agentInfo").append("window.screen.height: " + window.screen.height+ "
"); - $(".agentInfo").append("window.screen.availHeight: " + window.screen.availHeight+ "
"); - $(".agentInfo").append("
"); - $(".agentInfo").append("user agent: " + navigator.userAgent + "
"); -}; - -function doOnOrientationChange() { - console.log("doOnOrientationChange"); - doClientAndOrientationStuff(); - - // switch(window.orientation) { - // case -90: - // case 90: - // alert('landscape'); - // break; - // default: - // alert('portrait'); - // break; - // } -} - -var drawAreaContainerMinHeight = 300; -var drawAreaContainerMaxHeight = 450; -function doOnResize() { - // console.log("doOnResize() >> " + new Date().getTime()); -// $(".container").css("height", window.innerHeight); - - // code from new layouting approach... //TODO give this a more logical spot - $drawAreaContainer.css("marginTop", -parseInt($drawAreaContainer.css("height"))/2); - - canvas.width = $drawAreaContainer.width() - 150; // canvas.clientWidth; - canvas.height = $drawAreaContainer.height(); // canvas.clientHeight; - // canvas.width = canvas.clientWidth; - // canvas.height = canvas.clientHeight; - - // $("#drawAreaContainer").attr("width", parseInt($("#drawAreaContainer").css("width"), 10)); - // $("#drawAreaContainer").attr("height", parseInt($("#drawAreaContainer").css("height"), 10)); - // canvas.width = parseInt($canvas.css("width"), 10); - // canvas.height = parseInt($canvas.css("height"), 10); - - preview.width = 150; - preview.height = $drawAreaContainer.height(); -// preview.width = parseInt($preview.css("width"), 10); -// preview.height = parseInt($preview.css("height"), 10); - - canvasWidth = canvas.width; - canvasHeight = canvas.height; - - redrawDoodle(); - redrawPreview(); - - return; - -// doClientAndOrientationStuff() // <-- is this necessary in this method? - -// console.log("f:doOnResize() >> $('#canvascontainer').innerHeight: " + window.innerHeight); - if (window.innerHeight < 768) { -// $('#drawAreaContainer').innerHeight(window.innerHeight - $("#drawAreaContainer").offset().top - 70); - var newVal = window.innerHeight - $("#drawAreaContainer").offset().top - 100; // what's the 70 ?? - newVal = Math.max(newVal, drawAreaContainerMinHeight); - newVal = Math.min(newVal, drawAreaContainerMaxHeight); - - $('#drawAreaContainer').innerHeight(newVal); - - // canvas drawing area - $canvas.css("height", newVal); - canvas.height = newVal; - canvasWidth = canvas.width; - canvasHeight = canvas.height; - - // preview area - $preview.css("height", newVal); - preview.height = newVal; - layerOffsetY = preview.height - 1.75 * layerCY; - yStep = preview.height / 150; - - redrawDoodle(); - redrawPreview(); - } -} - -function initLayouting() { - console.log("f:initLayouting()"); - - // first set the css width/height and actual width/height of the drawing area - - - - -// $doodleCanvas = $("#mycanvas"); -// doodleCanvas = $("#mycanvas")[0]; -// doodleCanvasContext = doodleCanvas.getContext('2d'); - - $drawAreaContainer = $("#drawAreaContainer"); - $drawAreaContainer.css("margin", 0); - $drawAreaContainer.css("marginLeft", -parseInt($drawAreaContainer.css("width"))/2); - $drawAreaContainer.css("marginTop", -parseInt($drawAreaContainer.css("height"))/2); - - canvas.width = $drawAreaContainer.width() - 150; // canvas.clientWidth; - canvas.height = $drawAreaContainer.height(); // canvas.clientHeight; -// canvas.width = canvas.clientWidth; -// canvas.height = canvas.clientHeight; - - preview.width = 150; - preview.height = $drawAreaContainer.height(); - - // code from new layouting approach... //TODO give this a more logical spot -// $("#drawAreaContainer").attr("width", parseInt($("#drawAreaContainer").css("width"), 10)); -// $("#drawAreaContainer").attr("height", parseInt($("#drawAreaContainer").css("height"), 10)); -// canvas.width = parseInt($canvas.css("width"), 10); -// canvas.height = parseInt($canvas.css("height"), 10); -// preview.width = parseInt($preview.css("width"), 10); -// preview.height = parseInt($preview.css("height"), 10); - canvasWidth = canvas.width; - canvasHeight = canvas.height; - -// console.log("f:initLayouting() >> canvas height: " + canvas.height); - - - - // imgDims[0] = parseInt($(".container").css("width").match(/[0-9]+/).join("")); - // imgDims[1] = parseInt($(".container").css("height").match(/[0-9]+/).join("")); - -// imgDims = [1024, 768]; - - /* - if( /Android|webOS|BlackBerry/i.test(navigator.userAgent) ) { - imgDims[1] = parseInt($(".container").css("height").match(/[0-9]+/).join("")); - } else if ( /iPhone|iPad|iPod/i.test(navigator.userAgent) ) { - imgDims[1] = parseInt($(".container").css("width").match(/[0-9]+/).join("")); - } else { - imgDims[1] = parseInt($(".container").css("height").match(/[0-9]+/).join("")); - } - //*/ - - // $(".container").css("height", window.innerHeight); - - // window.innerHeight - console.log("window.innerHeight: " + window.innerHeight); - console.log("window.innerWidth: " + window.innerWidth); - console.log("$('#drawAreaContainer').innerHeight(): " + $("#drawAreaContainer").innerHeight()); - console.log("$('#drawAreaContainer').offset().top: " + $("#drawAreaContainer").offset().top); - - - /* 2013-07-26 not doing this resizing stuff now, it's not working well yet - if (window.innerHeight < 768) { - $('#drawAreaContainer').innerHeight(window.innerHeight - $("#drawAreaContainer").offset().top - 70); - } - //*/ - - // timeout because it SEEMS to be beneficial for initting the layout - // 2013-09-18 seems beneficial since when? - setTimeout(_startOrientationAndChangeEventListening, 1000); -} - -function _startOrientationAndChangeEventListening() { - // Initial execution if needed - - $(window).on('resize', doOnResize); - -// if (!window.addEventListener) { -// window.attachEvent('orientationchange', doOnOrientationChange, false); -// window.attachEvent('resize', doOnResize, false); -// } else { -// window.addEventListener('orientationchange', doOnOrientationChange, false); -// window.addEventListener('resize', doOnResize, false); -// } - - // is it necessary to call these? Aren't they called by the above eventhandlers? -// doClientAndOrientationStuff(); - doOnResize(); -} diff --git a/js_old/libs/bootstrap.js b/js_old/libs/bootstrap.js deleted file mode 100644 index 643e71c..0000000 --- a/js_old/libs/bootstrap.js +++ /dev/null @@ -1,2280 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ - - $(function () { - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd otransitionend' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.trigger(e = $.Event('close')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.alert - - $.fn.alert = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT NO CONFLICT - * ================= */ - - $.fn.alert.noConflict = function () { - $.fn.alert = old - return this - } - - - /* ALERT DATA-API - * ============== */ - - $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) - -}(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - Button.prototype.toggle = function () { - var $parent = this.$element.closest('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - var old = $.fn.button - - $.fn.button = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON NO CONFLICT - * ================== */ - - $.fn.button.noConflict = function () { - $.fn.button = old - return this - } - - - /* BUTTON DATA-API - * =============== */ - - $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.$indicators = this.$element.find('.carousel-indicators') - this.options = options - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function (e) { - if (!e) this.paused = false - if (this.interval) clearInterval(this.interval); - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this - } - - , getActiveIndex: function () { - this.$active = this.$element.find('.item.active') - this.$items = this.$active.parent().children() - return this.$items.index(this.$active) - } - - , to: function (pos) { - var activeIndex = this.getActiveIndex() - , that = this - - if (pos > (this.$items.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activeIndex == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) - } - - , pause: function (e) { - if (!e) this.paused = true - if (this.$element.find('.next, .prev').length && $.support.transition.end) { - this.$element.trigger($.support.transition.end) - this.cycle(true) - } - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.item.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - e = $.Event('slide', { - relatedTarget: $next[0] - , direction: direction - }) - - if ($next.hasClass('active')) return - - if (this.$indicators.length) { - this.$indicators.find('.active').removeClass('active') - this.$element.one('slid', function () { - var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) - $nextIndicator && $nextIndicator.addClass('active') - }) - } - - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.carousel - - $.fn.carousel = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - , action = typeof option == 'string' ? option : options.slide - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (action) data[action]() - else if (options.interval) data.pause().cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL NO CONFLICT - * ==================== */ - - $.fn.carousel.noConflict = function () { - $.fn.carousel = old - return this - } - - /* CAROUSEL DATA-API - * ================= */ - - $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = $.extend({}, $target.data(), $this.data()) - , slideIndex - - $target.carousel(options) - - if (slideIndex = $this.attr('data-slide-to')) { - $target.data('carousel').pause().to(slideIndex).cycle() - } - - e.preventDefault() - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning || this.$element.hasClass('in')) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - $.support.transition && this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning || !this.$element.hasClass('in')) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSE PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.collapse - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSE NO CONFLICT - * ==================== */ - - $.fn.collapse.noConflict = function () { - $.fn.collapse = old - return this - } - - - /* COLLAPSE DATA-API - * ================= */ - - $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - $(target).collapse(option) - }) - -}(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle=dropdown]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function (e) { - var $this = $(this) - , $parent - , isActive - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) { - if ('ontouchstart' in document.documentElement) { - // if mobile we we use a backdrop because click events don't delegate - $('