Merge branch 'master' of https://github.com/surveyjs/widgets

Author: Dmitry Kuzin (DevExpress)

src/bootstrap-slider.js

@@ -101,15 +101,15 @@ function init(Survey) {
     },
     pdfRender: function(_, options) {
       if (options.question.getType() === "bootstrapslider") {
-        var point = SurveyPDF.SurveyHelper.createPoint(
-          SurveyPDF.SurveyHelper.mergeRects.apply(null,
+        var point = options.module.SurveyHelper.createPoint(
+          options.module.SurveyHelper.mergeRects.apply(null,
             options.bricks));
         point.xLeft += options.controller.unitWidth;
         point.yTop += options.controller.unitHeight *
-          SurveyPDF.FlatQuestion.CONTENT_GAP_VERT_SCALE;
-        var rect = SurveyPDF.SurveyHelper.
+          options.module.FlatQuestion.CONTENT_GAP_VERT_SCALE;
+        var rect = options.module.SurveyHelper.
           createTextFieldRect(point, options.controller);
-        var textboxBrick = new SurveyPDF.TextFieldBrick(
+        var textboxBrick = new options.module.TextFieldBrick(
           options.question, options.controller, rect,
           true, options.question.id, options.question.value ||
           options.question.defaultValue, "",

src/ck-editor.js

@@ -62,19 +62,19 @@ function init(Survey) {
     },
     pdfRender: function(_, options) {
       if (options.question.getType() === "editor") {
-        var point = SurveyPDF.SurveyHelper.createPoint(
-          SurveyPDF.SurveyHelper.mergeRects.apply(null,
+        var point = options.module.SurveyHelper.createPoint(
+          options.module.SurveyHelper.mergeRects.apply(null,
             options.bricks));
         point.xLeft += options.controller.unitWidth;
         point.yTop += options.controller.unitHeight *
-          SurveyPDF.FlatQuestion.CONTENT_GAP_VERT_SCALE;
-        var html = SurveyPDF.SurveyHelper.createDivBlock(
+          options.module.FlatQuestion.CONTENT_GAP_VERT_SCALE;
+        var html = options.module.SurveyHelper.createDivBlock(
           options.question.value, options.controller);
         return new Promise(function(resolve) {
-          SurveyPDF.SurveyHelper.createHTMLFlat(point,
+          options.module.SurveyHelper.createHTMLFlat(point,
             options.question, options.controller, html).then(
               function (htmlFlat) {
-                var htmlBrick = SurveyPDF.SurveyHelper.
+                var htmlBrick = options.module.SurveyHelper.
                   splitHtmlRect(options.controller, htmlFlat);
                 options.bricks.push(htmlBrick);
                 resolve();

src/nouislider.js

@@ -93,18 +93,18 @@ function init(Survey) {
     },
     pdfRender: function(_, options) {
       if (options.question.getType() === "nouislider") {
-        var point = SurveyPDF.SurveyHelper.createPoint(
-          SurveyPDF.SurveyHelper.mergeRects.apply(null, options.bricks)
+        var point = options.module.SurveyHelper.createPoint(
+          options.module.SurveyHelper.mergeRects.apply(null, options.bricks)
         );
         point.xLeft += options.controller.unitWidth;
         point.yTop +=
           options.controller.unitHeight *
-          SurveyPDF.FlatQuestion.CONTENT_GAP_VERT_SCALE;
-        var rect = SurveyPDF.SurveyHelper.createTextFieldRect(
+          options.module.FlatQuestion.CONTENT_GAP_VERT_SCALE;
+        var rect = options.module.SurveyHelper.createTextFieldRect(
           point,
           options.controller
         );
-        var textboxBrick = new SurveyPDF.TextFieldBrick(
+        var textboxBrick = new options.module.TextFieldBrick(
           options.question,
           options.controller,
           rect,

src/signature_pad.js

@@ -121,13 +121,13 @@ function init(Survey) {
     },
     pdfRender: function(surveyPDF, options) {
       if (options.question.getType() === "signaturepad") {
-        var point = SurveyPDF.SurveyHelper.createPoint(
-          SurveyPDF.SurveyHelper.mergeRects.apply(null,
+        var point = options.module.SurveyHelper.createPoint(
+          options.module.SurveyHelper.mergeRects.apply(null,
             options.bricks));
         point.xLeft += options.controller.unitWidth;
         point.yTop += options.controller.unitHeight *
-          SurveyPDF.FlatQuestion.CONTENT_GAP_VERT_SCALE;
-        var imageBrick = SurveyPDF.SurveyHelper.createImageFlat(
+          options.module.FlatQuestion.CONTENT_GAP_VERT_SCALE;
+        var imageBrick = options.module.SurveyHelper.createImageFlat(
           point, options.question, options.controller,
           surveyPDF.data[options.question.name],
           parseInt(options.question.width));