Changeset 29773 for other-projects/nz-flag-design/trunk/main-form/iterative-design.html

Timestamp:

2015-03-11T10:12:30+13:00 (9 years ago)

Author:

davidb

Message:

Changes so i) the choose-palette is a single interactive SVG csurface; 2) the JS runs more smoothly when 'started' at one of the later pages; and 3) changes to remove many of the warnings browsers produce when loading the page

File:

• other-projects/nz-flag-design/trunk/main-form/iterative-design.html (modified) (5 diffs)

other-projects/nz-flag-design/trunk/main-form/iterative-design.html

@@ -126 +126 @@
                 function reconfigureSvgCanvas(settings) {
                     console.log("*** entered reconfigureSvgCanvas");
-                    console.log("*** settings: " + settings.backgroundColor);
+                    console.log("*** settings: background=" + settings.backgroundColor);
+                    console.log("*** settings: w x h = " + settings.width + " x " + settings.height);
 
                     var design_frame = document.getElementById('design-2d-iframe');
                     var svgCanvas = design_frame.contentWindow.svgCanvas;
                     var svgedit = design_frame.contentWindow.svgedit;
+
+                    // Set the new canvas size
+                    svgCanvas.setResolution(settings.width, settings.height);
 
                     var widthVar = settings.width;
@@ -186 +190 @@
                     // Centres the canvas (somewhat)
                     //svgCanvas.updateCanvas(100, 100);
+
                 }
 
@@ -195 +200 @@
                     var la_y_dim = $(window).height() * 0.67;
 
-                    $('#side-by-side').show();
-
-                    $('#side-by-side')
-                    .liteAccordion({ theme : 'stitch', // 'light',
-                            rounded         : true,
-                            //responsive      : true,
-                            containerWidth  : la_x_dim,
-                            containerHeight : la_y_dim,
-                            onTriggerSlide : function() {
-                                console.log("onTriggerSlide: this = " + this);
-                                console.log("onTriggerSlide: id = " + this[0].id);
-                                if (this[0].id == "render-3d-div") {
-                                    console.log("Triggering SVG-Editor exportPNG()");
-                                    savePNGAsFile("PNG",null);
+                    $('#side-by-side').show(10, 
+              function() { 
+                        $('#side-by-side')
+                          .liteAccordion({ theme : 'stitch', // 'light',
+                                rounded         : true,
+                                //responsive      : true,
+                                containerWidth  : la_x_dim,
+                                containerHeight : la_y_dim,
+                                onTriggerSlide : function() {
+                                    console.log("onTriggerSlide: this = " + this);
+                                    console.log("onTriggerSlide: id = " + this[0].id);
+                                    if (this[0].id == "render-3d-div") {
+                                        console.log("Triggering SVG-Editor exportPNG()");
+                                        savePNGAsFile("PNG",null);
+                                    }
                                 }
-                            }
-                        });
+                            });
+            });
                 }
 
                 function activateSVGEditor() {
                     console.log("activateSVGEditor()");
-                    $('#design-2d-iframe').attr("src","svg-edit-trunk/editor/svg-editor.html?noStorageOnLoad=1");
+                    $('#design-2d-iframe').attr("src","svg-edit-trunk2/editor/svg-editor.html?noStorageOnLoad=1");
                     $('#design-2d-iframe').load(function() {
                         console.log("*** loaded sgv iframe: " + this);
@@ -230 +236 @@
 
                 $(document).on("pageload",function(event,data){
-                    console.log( "Iterative Design Page: jquerymobile pageload()" );
+                    console.log( "Iterative Design Page: jquerymobile pageload()");
                     if (!activatedAccordion) {
                         activateAccordion();        
@@ -251 +257 @@
                 $(document).on("pagebeforeshow",function(event,data) {
                     var active_page = $.mobile.activePage.attr("id");
-                    console.log("Event: pagebeforeshow() for page " + active_page);
+                    console.log("Iterative-Design fielding Event: pagebeforeshow() for page " + active_page);
 
                     if (active_page == "iterative-design-page") {