[Fmsystem-commits] [16512] More on helpdesk

[sigurdne]

Revision: 16512
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16512
Author:   sigurdne
Date:     2017-03-31 11:13:01 -0400 (Fri, 31 Mar 2017)
Log Message:
-----------
More on helpdesk

Modified Paths:
--------------
    trunk/helpdesk/inc/class.uitts.inc.php
    trunk/helpdesk/js/portico/tts.add.js
    trunk/helpdesk/templates/base/tts.xsl

Modified: trunk/helpdesk/inc/class.uitts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uitts.inc.php      2017-03-31 15:12:28 UTC (rev 
16511)
+++ trunk/helpdesk/inc/class.uitts.inc.php      2017-03-31 15:13:01 UTC (rev 
16512)
@@ -1168,9 +1168,7 @@
                                                        
$bofiles->vfs->override_acl = 0;
                                                }
                                        }
-                                       if($_POST['pasted_image'] &&
-                                               $_POST['pasted_image'] 
!='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAPklEQVR4nO3BMQEAAADCoPVPbQsvoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgKcBnKQAAaZ1lY4AAAAASUVORK5CYII='
-                                               )
+                                       if(!empty($_POST['pasted_image']) && 
empty($_POST['pasted_image_is_blank'])     )
                                        {
                                                $img = $_POST['pasted_image'];
                                                $img = 
str_replace('data:image/png;base64,', '', $img);

Modified: trunk/helpdesk/js/portico/tts.add.js
===================================================================
--- trunk/helpdesk/js/portico/tts.add.js        2017-03-31 15:12:28 UTC (rev 
16511)
+++ trunk/helpdesk/js/portico/tts.add.js        2017-03-31 15:13:01 UTC (rev 
16512)
@@ -35,9 +35,9 @@
                                else
                                {
                                        document.getElementById(action).value = 
1;
-                                       var canvas = 
document.getElementById("my_canvas");
-                                       var image_data = 
canvas.toDataURL('image/png');
-                                       $('#pasted_image').val(image_data);
+//                                     var canvas = 
document.getElementById("my_canvas");
+//                                     var image_data = 
canvas.toDataURL('image/png');
+//                                     $('#pasted_image').val(image_data);
 
                                        try
                                        {
@@ -83,6 +83,10 @@
 
 upload_canvas = function ()
 {
+       var canvas = document.getElementById("my_canvas");
+       var image_data = canvas.toDataURL('image/png');
+       $('#pasted_image').val(image_data);
+       $('#pasted_image_is_blank').val(0);
        confirm_session('apply');
 }
 

Modified: trunk/helpdesk/templates/base/tts.xsl
===================================================================
--- trunk/helpdesk/templates/base/tts.xsl       2017-03-31 15:12:28 UTC (rev 
16511)
+++ trunk/helpdesk/templates/base/tts.xsl       2017-03-31 15:13:01 UTC (rev 
16512)
@@ -212,6 +212,7 @@
                                                <canvas title="Copy image data 
into clipboard and press Ctrl+V" style="border:1px solid grey;" id="my_canvas" 
width="100" height="100">
                                                </canvas>
                                                <input type="hidden" 
id="pasted_image" name="pasted_image"></input>
+                                               <input type="hidden" 
id="pasted_image_is_blank" name="pasted_image_is_blank" value="1"></input>
                                        </div>
 
                                </fieldset>