Merge pull request #144 from xbsoftware/AZ_fixes

AZ fixes

Author: AZhurav1ev

enjoyhint.js

@@ -281,6 +281,12 @@
             scroll: step_data.scroll
           };
 
+          if (shape_data.center_x === 0 && shape_data.center_y === 0) {
+            $body.enjoyhint("hide");
+            destroyEnjoy();
+            return console.log("Error: Element position couldn't be reached");
+          }
+  
           if (step_data.shape && step_data.shape == "circle") {
             shape_data.shape = "circle";
             shape_data.radius = radius;
@@ -379,6 +385,8 @@
         case "skip":
           skipAll();
           break;
+  
+        default: $body.trigger(makeEventName(event_name, true));
       }
     };
 
@@ -1212,8 +1220,8 @@
           var left_offset = data.center_x - half_w;
           var right_offset = body_size.w - (data.center_x + half_w);
 
-          var label_shift = 150;
-          var label_margin = 40;
+          var label_shift = window.innerHeight < 670 ? 130 : 150;
+          var label_margin = window.innerHeight < 670 ? 0 : 40;
           var label_shift_with_label_height =
             label_shift + label_height + label_margin;
           var label_ver_offset = half_h + label_shift;
@@ -1229,7 +1237,7 @@
             {name: 'center_bottom', common_area: window.innerWidth * bottom_offset, width: window.innerWidth, height: bottom_offset},
           ];
           var label_horizontal_space_required = label_width;
-          var label_vertical_space_required = label_shift_with_label_height + 20;
+          var label_vertical_space_required = window.innerHeight <= 670 ? label_shift_with_label_height : label_shift_with_label_height + 20;
 
           var areas_priority = areas_for_label
             .sort(function(area1, area2){return area1.common_area - area2.common_area})
@@ -1246,8 +1254,11 @@
               }
           }
 
-          var data_width_size = data.width ? data.width : data.radius * 2;
-          var data_height_size = data.height ? data.height : data.radius * 2;
+          var data_width_size = data.shape === "circle" ? data.radius * 2 :
+            data.width ? data.width : data.radius * 2;
+
+          var data_height_size = data.shape === "circle" ? data.radius * 2 :
+            data.height ? data.height : data.radius * 2;
 
           var right_position = data.center_x + data_width_size/2 + 80;
           var left_position = data.center_x - label_width - data_width_size/2 - 80;