diff --git a/Gruntfile.js b/Gruntfile.js
index 41b4be6..110852f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -16,21 +16,22 @@ module.exports = function(grunt) {
},
dist: {
src: [
- 'www/js/SettingsWindow.js',
- 'www/js/d3dServerInterfacing.js',
- 'www/js/verticalShapes.js',
- 'www/js/buttonbehaviors.js',
- 'www/js/canvasDrawing.js',
- 'www/js/previewRendering.js',
- 'www/js/gcodeGenerating.js',
- 'www/js/init_layout.js',
- 'www/js/Printer.js',
- 'www/js/Progressbar.js',
- 'www/js/Thermometer.js',
- 'www/js/utils.js',
- 'www/js/sidebar.js',
- 'www/js/message.js',
- 'www/js/main.js'
+ 'js_src/SettingsWindow.js',
+ 'js_src/UpdatePanel.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'
],
dest: 'www/js/<%= pkg.name %>.js'
}
@@ -38,15 +39,21 @@ module.exports = function(grunt) {
uglify: {
options: {
// banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
- mangle: false,
+ mangle: true,
beautify: false,
compress: {},
report: 'min',
preserveComments: 'false'
},
build: {
- src: ['www/js/*.js', '!www/js/<%= pkg.name %>.min.js'],
- dest: 'www/js/<%= pkg.name %>.min.js'
+ files: {
+// 'www/js/<%= pkg.name %>.min.js' : ['www/js/*.js', '!www/js/<%= pkg.name %>.min.js', '!www/js/<%= pkg.name %>.js']
+ 'www/js/<%= pkg.name %>.min.js' : ['www/js/<%= pkg.name %>.js']
+ }
+// src: 'www/js/*.js',
+// dest: 'www/js/min/blabla.js'
+// src: ['www/js/*.js', '!www/js/<%= pkg.name %>.min.js'],
+// dest: 'www/js/<%= pkg.name %>.min.js'
}
},
jshint: {
@@ -85,11 +92,11 @@ module.exports = function(grunt) {
}
},
watch: {
-// javascript: {
-// files: ["www/js/*", '!www/js/*.min.js'],
-// // tasks: ["less", "css_prefix"]
-// tasks: ["uglify"]
-// },
+ javascript: {
+ files: ["js_src/*", '!www/js/<%= pkg.name %>.min.js', '!www/js/<%= pkg.name %>.js'],
+ tasks: ["concat", "uglify"]
+// tasks: ["jshint", "concat", "uglify"]
+ },
styles: {
files: ["less/*"],
tasks: ["less", "autoprefixer", "cssmin"]
@@ -133,8 +140,8 @@ module.exports = function(grunt) {
'less',
'autoprefixer',
'cssmin',
-// 'concat',
-// 'uglify',
+ 'concat',
+ 'uglify',
// 'jshint',
'watch'
]);
diff --git a/www/js/Message.js b/js_src/Message.js
similarity index 100%
rename from www/js/Message.js
rename to js_src/Message.js
diff --git a/www/js/Printer.js b/js_src/Printer.js
similarity index 100%
rename from www/js/Printer.js
rename to js_src/Printer.js
diff --git a/www/js/Progressbar.js b/js_src/Progressbar.js
similarity index 100%
rename from www/js/Progressbar.js
rename to js_src/Progressbar.js
diff --git a/www/js/SettingsWindow.js b/js_src/SettingsWindow.js
similarity index 100%
rename from www/js/SettingsWindow.js
rename to js_src/SettingsWindow.js
diff --git a/www/js/Thermometer.js b/js_src/Thermometer.js
similarity index 100%
rename from www/js/Thermometer.js
rename to js_src/Thermometer.js
diff --git a/www/js/UpdatePanel.js b/js_src/UpdatePanel.js
similarity index 100%
rename from www/js/UpdatePanel.js
rename to js_src/UpdatePanel.js
diff --git a/www/js/buttonbehaviors.js b/js_src/buttonbehaviors.js
similarity index 100%
rename from www/js/buttonbehaviors.js
rename to js_src/buttonbehaviors.js
diff --git a/www/js/canvasDrawing.js b/js_src/canvasDrawing.js
similarity index 100%
rename from www/js/canvasDrawing.js
rename to js_src/canvasDrawing.js
diff --git a/www/js/d3dServerInterfacing.js b/js_src/d3dServerInterfacing.js
similarity index 100%
rename from www/js/d3dServerInterfacing.js
rename to js_src/d3dServerInterfacing.js
diff --git a/www/js/gcodeGenerating.js b/js_src/gcodeGenerating.js
similarity index 100%
rename from www/js/gcodeGenerating.js
rename to js_src/gcodeGenerating.js
diff --git a/js_src/init_layout.js b/js_src/init_layout.js
new file mode 100644
index 0000000..4191375
--- /dev/null
+++ b/js_src/init_layout.js
@@ -0,0 +1,62 @@
+// TODO refactor this stuff, there's much to wipe
+var drawAreaContainerMinHeight = 300;
+var drawAreaContainerMaxHeight = 450;
+
+function doOnResize() {
+ // console.log("doOnResize() >> " + new Date().getTime());
+ canvas.width = $canvas.width();
+ canvas.height = $canvas.height(); // canvas.clientHeight;
+
+ preview.width = $preview.width();
+ preview.height = $drawAreaContainer.height();
+
+ canvasWidth = canvas.width;
+ canvasHeight = canvas.height;
+
+ console.log(" preview.width: " + preview.width + ", $preview.width(): " + $preview.width());
+
+ calcPreviewCanvasProperties();
+
+ drawCanvasTopLeftCoords[0] = drawCanvas.offset().left;
+ drawCanvasTopLeftCoords[1] = drawCanvas.offset().top;
+
+ redrawDoodle();
+ redrawPreview();
+
+}
+
+function initLayouting() {
+ console.log("f:initLayouting()");
+
+ $drawAreaContainer = $(".drawareacontainer");
+
+ canvas.width = $canvas.width();
+ canvas.height = $canvas.height(); // canvas.clientHeight;
+
+ preview.width = $preview.width();
+ preview.height = $drawAreaContainer.height();
+
+ canvasWidth = canvas.width;
+ canvasHeight = canvas.height;
+
+ $drawAreaContainer.show();
+
+ // 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);
+
+ // 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);
+
+ // is it necessary to call these? Aren't they called by the above eventhandlers?
+ doOnResize();
+}
diff --git a/www/js/main.js b/js_src/main.js
similarity index 99%
rename from www/js/main.js
rename to js_src/main.js
index fc7ad01..3717a01 100644
--- a/www/js/main.js
+++ b/js_src/main.js
@@ -17,6 +17,9 @@ var wifiboxCGIBinURL; // CGI-bin, for some network stuff, where it needs to rest
var $drawAreaContainer, $doodleCanvas, doodleCanvas, doodleCanvasContext, $previewContainer;
+var showhideInterval;
+var showOrHide = false;
+
$(function() {
console.log("ready");
@@ -103,9 +106,6 @@ $(function() {
}
});
-var showhideInterval;
-var showOrHide = false;
-
function showOrHideThermo() {
console.log("f:showOrHideThermo()");
if (showOrHide) {
diff --git a/www/js/previewRendering.js b/js_src/previewRendering.js
similarity index 100%
rename from www/js/previewRendering.js
rename to js_src/previewRendering.js
diff --git a/www/js/sidebar.js b/js_src/sidebar.js
similarity index 100%
rename from www/js/sidebar.js
rename to js_src/sidebar.js
diff --git a/www/js/utils.js b/js_src/utils.js
similarity index 100%
rename from www/js/utils.js
rename to js_src/utils.js
diff --git a/www/js/verticalShapes.js b/js_src/verticalShapes.js
similarity index 100%
rename from www/js/verticalShapes.js
rename to js_src/verticalShapes.js
diff --git a/package.json b/package.json
index a0f7f1b..b224a64 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "doodle3dclient",
+ "name": "doodle3d-client",
"version": "0.9.0",
"description": "Doodle3D client app",
"repository": {
diff --git a/www/index.html b/www/index.html
index 1b79cea..021e822 100755
--- a/www/index.html
+++ b/www/index.html
@@ -130,22 +130,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+