Changeset 3ae7c21 in firmaeventos for static/js

Timestamp:

Nov 27, 2017, 9:30:31 AM (7 years ago)

Author:

lhernandez <lhernandez@…>

Branches:

master

Children:

2b66ea3

Parents:

5d88f36 (diff), 6228b65 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/cenditel-desarrollo/FirmaEventos

Location:

static/js

Files:

• DraggableSortable.js (modified) (1 diff)
• docsDraggable.js (modified) (1 prop)
• formset.js (modified) (1 prop)
• funciones.js (modified) (3 diffs)
• jquery/jquery-ui.js (modified) (1 prop)
• pdf.js (modified) (1 prop)
• pdf.worker.js (modified) (1 prop)

static/js/DraggableSortable.js

@@ -29 +29 @@
         if (num == 1){
           $("#firma_visible #Formato_Visible .text").hide();
-          console.log(VALOR_X);
           VALOR_X = 0;
           VALOR_Y = 0;

static/js/funciones.js

@@ -74 +74 @@
     html += '<li class="collection-item"><b>Correo: </b>'+data.correo+'</li>';
     html += '</ul>';
-    html += '<iframe width="700px" height="600px" src="https://192.168.12.154:8443/Murachi/0.1/archivos/listadopdf/'+data.documento+'">';
+    html += '<iframe width="700px" height="600px" src="https://murachi.cenditel.gob.ve/Murachi/0.1/archivos/listadopdf/'+data.documento+'">';
     html += '</iframe><br/>';
     if (firma==true) {
@@ -161 +161 @@
                 type: 'POST',
                 contentType: 'application/json',                                
-                url:"https://192.168.12.154:8443/Murachi/0.1/archivos/pdfs2",
-                //url:"https://murachi.cenditel.gob.ve/Murachi/0.1/archivos/pdfs",
-        //url: "https://murachi.cenditel.gob.ve/Murachi/0.1/archivos/firmados/pdfs",
+                url:"https://murachi.cenditel.gob.ve/Murachi/0.1/archivos/pdfsqr",
                 dataType: "json",
                 data: parameters,               
@@ -210 +208 @@
                 type: 'POST',
                 contentType: 'application/json',
-                url:"https://192.168.12.154:8443/Murachi/0.1/archivos/pdfs/resenas",
-                //url:"https://murachi.cenditel.gob.ve/Murachi/0.1/archivos/pdfs/resenas",
+                url:"https://murachi.cenditel.gob.ve/Murachi/0.1/archivos/pdfs/resenas",
                 dataType: 'json',
                 data: JSON.stringify({"signature":signature}),