| @@ -456,93 +456,25 @@ | ||
| 456 | 456 | // e2pdf.hooks |
| 457 | 457 | hooks: { |
| 458 | 458 | // e2pdf.hooks.get |
| 459 | 459 | get: function () { |
| 460 | + var extension = e2pdf.pdf.settings.get('extension'); | |
| 460 | 461 | var hooks = {}; |
| 461 | - switch (e2pdf.pdf.settings.get('extension')) { | |
| 462 | - case 'formidable': | |
| 463 | - hooks = { | |
| 464 | - 'hook_formidable_entry_view': e2pdf.lang.get('WP Admin Entry View'), | |
| 465 | - 'hook_formidable_entry_edit': e2pdf.lang.get('WP Admin Entry Edit'), | |
| 466 | - 'hook_formidable_row_actions': e2pdf.lang.get('WP Admin Entry Row Actions') | |
| 467 | - }; | |
| 468 | - break; | |
| 469 | - case 'gravity': | |
| 470 | - hooks = { | |
| 471 | - 'hook_gravity_entry_view': e2pdf.lang.get('WP Admin Entry View'), | |
| 472 | - 'hook_gravity_row_actions': e2pdf.lang.get('WP Admin Entry Row Actions') | |
| 473 | - }; | |
| 474 | - break; | |
| 475 | - case 'jetformbuilder': | |
| 476 | - hooks = { | |
| 477 | - 'hook_jetformbuilder_entry_view': e2pdf.lang.get('WP Admin Entry View') | |
| 478 | - }; | |
| 479 | - break; | |
| 462 | + switch (extension) { | |
| 480 | 463 | case 'woocommerce': |
| 481 | - if (e2pdf.pdf.settings.get('item') == 'shop_order') { | |
| 482 | - hooks = { | |
| 483 | - 'hook_woocommerce_order_edit': e2pdf.lang.get('WP Admin Order Details'), | |
| 484 | - 'hook_woocommerce_order_row_actions': e2pdf.lang.get('WP Admin Order List Actions'), | |
| 485 | - 'hook_woocommerce_order_row_column': e2pdf.lang.get('WP Admin Order List Column'), | |
| 486 | - 'hook_woocommerce_my_account_my_orders_actions': e2pdf.lang.get('User Order List'), | |
| 487 | - 'hook_woocommerce_order_details_before_order_table': e2pdf.lang.get('User Order Details (Before Order Table)'), | |
| 488 | - 'hook_woocommerce_order_details_before_order_table_items': e2pdf.lang.get('User Order Details (Before Order Table Items)'), | |
| 489 | - 'hook_woocommerce_order_details_after_order_table_items': e2pdf.lang.get('User Order Details (After Order Table Items)'), | |
| 490 | - 'hook_woocommerce_order_details_after_order_table': e2pdf.lang.get('User Order Details (After Order Table)'), | |
| 491 | - 'hook_woocommerce_after_order_details': e2pdf.lang.get('User Order Details (After Order Details)'), | |
| 492 | - }; | |
| 493 | - } else if (e2pdf.pdf.settings.get('item') == 'shop_subscription') { | |
| 494 | - hooks = { | |
| 495 | - 'hook_woocommerce_subscription_edit': e2pdf.lang.get('WP Admin Subscription Details'), | |
| 496 | - 'hook_woocommerce_subscription_row_column': e2pdf.lang.get('WP Admin Order List Column'), | |
| 497 | - 'hook_woocommerce_subscription_before_actions': e2pdf.lang.get('User Subscription (Before Actions)'), | |
| 498 | - 'hook_woocommerce_subscription_after_actions': e2pdf.lang.get('User Subscription (After Actions)'), | |
| 499 | - 'hook_wcs_subscription_details_table_before_dates': e2pdf.lang.get('User Subscription (Before Dates)'), | |
| 500 | - 'hook_wcs_subscription_details_table_after_dates': e2pdf.lang.get('User Subscription (After Dates)'), | |
| 501 | - 'hook_wcs_subscription_details_table_before_payment_method': e2pdf.lang.get('User Subscription (Before Payment Method)'), | |
| 502 | - 'hook_wcs_view_subscription_actions': e2pdf.lang.get('User Subscrition (Actions)'), | |
| 503 | - }; | |
| 504 | - } else if (e2pdf.pdf.settings.get('item') == 'cart') { | |
| 505 | - hooks = { | |
| 506 | - 'hook_woocommerce_proceed_to_checkout': e2pdf.lang.get('User Cart'), | |
| 507 | - 'hook_woocommerce_review_order_before_submit': e2pdf.lang.get('User Checkout (Before Submit)'), | |
| 508 | - 'hook_woocommerce_review_order_after_submit': e2pdf.lang.get('User Checkout (After Submit)'), | |
| 509 | - }; | |
| 464 | + if (e2pdf.pdf.settings.get('item')) { | |
| 465 | + hooks = e2pdf_params['extension_hooks'][extension + '_' + e2pdf.pdf.settings.get('item')] || {}; | |
| 510 | 466 | } |
| 511 | 467 | break; |
| 512 | 468 | case 'wordpress': |
| 513 | 469 | if (e2pdf.pdf.settings.get('item') == '-3') { |
| 514 | - hooks = { | |
| 515 | - 'hook_wordpress_row_actions': e2pdf.lang.get('WP Admin User Row Actions') | |
| 516 | - }; | |
| 470 | + hooks = e2pdf_params['extension_hooks'][extension + '_' + e2pdf.pdf.settings.get('item')] || {}; | |
| 517 | 471 | } else { |
| 518 | - hooks = { | |
| 519 | - 'hook_wordpress_page_edit': e2pdf.lang.get('WP Admin Page Edit'), | |
| 520 | - 'hook_wordpress_row_actions': e2pdf.lang.get('WP Admin Page Row Actions') | |
| 521 | - }; | |
| 472 | + hooks = e2pdf_params['extension_hooks'][extension] || {}; | |
| 522 | 473 | } |
| 523 | 474 | break; |
| 524 | - case 'wpforms': | |
| 525 | - hooks = { | |
| 526 | - 'hook_wpforms_entry_view': e2pdf.lang.get('WP Admin Entry View'), | |
| 527 | - 'hook_wpforms_entry_edit': e2pdf.lang.get('WP Admin Entry Edit'), | |
| 528 | - 'hook_wpforms_row_actions': e2pdf.lang.get('WP Admin Entry Row Actions') | |
| 529 | - }; | |
| 530 | - break; | |
| 531 | - case 'everest': | |
| 532 | - hooks = { | |
| 533 | - 'hook_everest_entry_view': e2pdf.lang.get('WP Admin Entry View'), | |
| 534 | - 'hook_everest_row_actions': e2pdf.lang.get('WP Admin Entry Row Actions') | |
| 535 | - }; | |
| 536 | - break; | |
| 537 | - case 'metform': | |
| 538 | - hooks = { | |
| 539 | - 'hook_metform_entry_view': e2pdf.lang.get('WP Admin Entry View'), | |
| 540 | - 'hook_metform_row_actions': e2pdf.lang.get('WP Admin Entry Row Actions'), | |
| 541 | - 'hook_metform_entry_row_column': e2pdf.lang.get('WP Admin Entry List Column') | |
| 542 | - }; | |
| 543 | - break; | |
| 544 | 475 | default: |
| 476 | + hooks = e2pdf_params['extension_hooks'][extension] || {}; | |
| 545 | 477 | break; |
| 546 | 478 | } |
| 547 | 479 | return hooks; |
| 548 | 480 | }, |
| @@ -625,10 +557,10 @@ | ||
| 625 | 557 | // e2pdf.guide.calc |
| 626 | 558 | calc: function (el, pos, w, h, g) { |
| 627 | 559 | if (el != null) { |
| 628 | 560 | if (g) { |
| 629 | - w = parseFloat(jQuery(el).css('width')) * e2pdf.zoom.zoom; | |
| 630 | - h = parseFloat(jQuery(el).css('height')) * e2pdf.zoom.zoom; | |
| 561 | + w = parseFloat(jQuery(el).css('width')) * e2pdf.zoom.scale; | |
| 562 | + h = parseFloat(jQuery(el).css('height')) * e2pdf.zoom.scale; | |
| 631 | 563 | pos = jQuery(el).offset(); |
| 632 | 564 | if (jQuery(el).hasClass('e2pdf-page')) { |
| 633 | 565 | pos = { |
| 634 | 566 | left: pos.left + 1, |
| @@ -829,9 +761,9 @@ | ||
| 829 | 761 | jQuery('.e2pdf-export-form-submit').attr('disabled', 'disabled'); |
| 830 | 762 | jQuery('.e2pdf-export-options, .e2pdf-export-item, .e2pdf-dataset-shortcode-wr').hide(); |
| 831 | 763 | jQuery('.e2pdf-export-template-actions, .e2pdf-export-dataset-actions').empty(); |
| 832 | 764 | jQuery('.e2pdf-export-dataset').data('options', []).empty(); |
| 833 | - jQuery('.e2pdf-export-dataset-search').val(''); | |
| 765 | + jQuery('.e2pdf-fieldset-filter').val(''); | |
| 834 | 766 | e2pdf.select2.disable(el); |
| 835 | 767 | break; |
| 836 | 768 | case 'e2pdf_dataset': |
| 837 | 769 | jQuery('.e2pdf-export-form-submit').attr('disabled', 'disabled'); |
| @@ -3369,9 +3301,9 @@ | ||
| 3369 | 3301 | obj = { |
| 3370 | 3302 | 'name': e2pdf.lang.get('Position Top'), |
| 3371 | 3303 | 'type': 'text', |
| 3372 | 3304 | 'value': e2pdf.helper.getFloat(el.css('top')), |
| 3373 | - 'atts': ['number'] | |
| 3305 | + 'atts': ['number', 'keep'] | |
| 3374 | 3306 | }; |
| 3375 | 3307 | break; |
| 3376 | 3308 | case 'left': |
| 3377 | 3309 | obj = { |
| @@ -3377,9 +3309,9 @@ | ||
| 3377 | 3309 | obj = { |
| 3378 | 3310 | 'name': e2pdf.lang.get('Position Left'), |
| 3379 | 3311 | 'type': 'text', |
| 3380 | 3312 | 'value': e2pdf.helper.getFloat(el.css('left')), |
| 3381 | - 'atts': ['number'] | |
| 3313 | + 'atts': ['number', 'keep'] | |
| 3382 | 3314 | }; |
| 3383 | 3315 | break; |
| 3384 | 3316 | case 'name': |
| 3385 | 3317 | obj = { |
| @@ -4611,8 +4543,26 @@ | ||
| 4611 | 4543 | 'value': e2pdf.helper.getString(properties[field]), |
| 4612 | 4544 | 'options': e2pdf.helper.font.sizes(field) |
| 4613 | 4545 | }; |
| 4614 | 4546 | break; |
| 4547 | + case 'g_axis_font_size_h': | |
| 4548 | + obj = { | |
| 4549 | + 'name': e2pdf.lang.get('Font Size'), | |
| 4550 | + 'key': 'g_axis_font_size_h', | |
| 4551 | + 'type': 'select', | |
| 4552 | + 'value': e2pdf.helper.getString(properties[field]), | |
| 4553 | + 'options': e2pdf.helper.font.sizes(field) | |
| 4554 | + }; | |
| 4555 | + break; | |
| 4556 | + case 'g_axis_font_size_v': | |
| 4557 | + obj = { | |
| 4558 | + 'name': e2pdf.lang.get('Font Size'), | |
| 4559 | + 'key': 'g_axis_font_size_v', | |
| 4560 | + 'type': 'select', | |
| 4561 | + 'value': e2pdf.helper.getString(properties[field]), | |
| 4562 | + 'options': e2pdf.helper.font.sizes(field) | |
| 4563 | + }; | |
| 4564 | + break; | |
| 4615 | 4565 | case 'g_axis_overlap': |
| 4616 | 4566 | obj = { |
| 4617 | 4567 | 'name': e2pdf.lang.get('Axis Overlap'), |
| 4618 | 4568 | 'type': 'text', |
| @@ -4682,8 +4632,22 @@ | ||
| 4682 | 4632 | 'type': 'color', |
| 4683 | 4633 | 'value': e2pdf.helper.getString(properties[field]) |
| 4684 | 4634 | }; |
| 4685 | 4635 | break; |
| 4636 | + case 'g_axis_colour_h': | |
| 4637 | + obj = { | |
| 4638 | + 'name': e2pdf.lang.get('Axis Color'), | |
| 4639 | + 'type': 'color', | |
| 4640 | + 'value': e2pdf.helper.getString(properties[field]) | |
| 4641 | + }; | |
| 4642 | + break; | |
| 4643 | + case 'g_axis_colour_v': | |
| 4644 | + obj = { | |
| 4645 | + 'name': e2pdf.lang.get('Axis Color'), | |
| 4646 | + 'type': 'color', | |
| 4647 | + 'value': e2pdf.helper.getString(properties[field]) | |
| 4648 | + }; | |
| 4649 | + break; | |
| 4686 | 4650 | case 'g_grid_colour': |
| 4687 | 4651 | obj = { |
| 4688 | 4652 | 'name': e2pdf.lang.get('Grid Color'), |
| 4689 | 4653 | 'key': 'g_grid_colour', |
| @@ -4711,9 +4675,9 @@ | ||
| 4711 | 4675 | obj = { |
| 4712 | 4676 | 'name': e2pdf.lang.get('Space'), |
| 4713 | 4677 | 'type': 'text', |
| 4714 | 4678 | 'value': e2pdf.helper.getInt(properties[field]), |
| 4715 | - 'atts': ['number'] | |
| 4679 | + 'atts': ['number', 'keep'] | |
| 4716 | 4680 | }; |
| 4717 | 4681 | break; |
| 4718 | 4682 | case 'g_bar_label_colour': |
| 4719 | 4683 | obj = { |
| @@ -4783,8 +4747,42 @@ | ||
| 4783 | 4747 | 'value': e2pdf.helper.getCheckbox(properties[field]), |
| 4784 | 4748 | 'option': '1' |
| 4785 | 4749 | }; |
| 4786 | 4750 | break; |
| 4751 | + case 'g_show_labels': | |
| 4752 | + obj = { | |
| 4753 | + 'name': e2pdf.lang.get('Labels'), | |
| 4754 | + 'type': 'checkbox', | |
| 4755 | + 'value': e2pdf.helper.getCheckbox(properties[field]), | |
| 4756 | + 'option': '1', | |
| 4757 | + 'atts': ['keep'], | |
| 4758 | + }; | |
| 4759 | + break; | |
| 4760 | + case 'g_show_label_key': | |
| 4761 | + obj = { | |
| 4762 | + 'name': e2pdf.lang.get('Key Labels'), | |
| 4763 | + 'type': 'checkbox', | |
| 4764 | + 'value': e2pdf.helper.getCheckbox(properties[field]), | |
| 4765 | + 'option': '1', | |
| 4766 | + 'atts': ['keep'], | |
| 4767 | + }; | |
| 4768 | + break; | |
| 4769 | + case 'g_show_label_amount': | |
| 4770 | + obj = { | |
| 4771 | + 'name': e2pdf.lang.get('Amount Labels'), | |
| 4772 | + 'type': 'checkbox', | |
| 4773 | + 'value': e2pdf.helper.getCheckbox(properties[field]), | |
| 4774 | + 'option': '1' | |
| 4775 | + }; | |
| 4776 | + break; | |
| 4777 | + case 'g_show_label_percent': | |
| 4778 | + obj = { | |
| 4779 | + 'name': e2pdf.lang.get('Percent Labels'), | |
| 4780 | + 'type': 'checkbox', | |
| 4781 | + 'value': e2pdf.helper.getCheckbox(properties[field]), | |
| 4782 | + 'option': '1' | |
| 4783 | + }; | |
| 4784 | + break; | |
| 4787 | 4785 | case 'g_marker_type': |
| 4788 | 4786 | obj = { |
| 4789 | 4787 | 'name': e2pdf.lang.get('Marker'), |
| 4790 | 4788 | 'type': 'select', |
| @@ -5092,9 +5090,9 @@ | ||
| 5092 | 5090 | obj = { |
| 5093 | 5091 | 'name': e2pdf.lang.get('Height'), |
| 5094 | 5092 | 'type': 'text', |
| 5095 | 5093 | 'value': e2pdf.helper.getInt(properties[field]), |
| 5096 | - 'atts': ['number'] | |
| 5094 | + 'atts': ['number', 'keep'] | |
| 5097 | 5095 | }; |
| 5098 | 5096 | break; |
| 5099 | 5097 | case 'g_legend_padding_x': |
| 5100 | 5098 | obj = { |
| @@ -5280,9 +5278,9 @@ | ||
| 5280 | 5278 | obj = { |
| 5281 | 5279 | 'name': e2pdf.lang.get('Space'), |
| 5282 | 5280 | 'type': 'text', |
| 5283 | 5281 | 'value': e2pdf.helper.getInt(properties[field], 2), |
| 5284 | - 'atts': ['number'] | |
| 5282 | + 'atts': ['number', 'number-negative', 'keep'] | |
| 5285 | 5283 | }; |
| 5286 | 5284 | break; |
| 5287 | 5285 | case 'g_axis_text_space_h': |
| 5288 | 5286 | obj = { |
| @@ -5288,9 +5286,9 @@ | ||
| 5288 | 5286 | obj = { |
| 5289 | 5287 | 'name': e2pdf.lang.get('Space'), |
| 5290 | 5288 | 'type': 'text', |
| 5291 | 5289 | 'value': e2pdf.helper.getInt(properties[field], 2), |
| 5292 | - 'atts': ['number'] | |
| 5290 | + 'atts': ['number', 'number-negative', 'keep'] | |
| 5293 | 5291 | }; |
| 5294 | 5292 | break; |
| 5295 | 5293 | case 'g_axis_text_offset_x_v': |
| 5296 | 5294 | obj = { |
| @@ -5358,8 +5356,22 @@ | ||
| 5358 | 5356 | 'type': 'textarea', |
| 5359 | 5357 | 'value': e2pdf.helper.getString(properties[field]) |
| 5360 | 5358 | }; |
| 5361 | 5359 | break; |
| 5360 | + case 'g_axis_text_callback_y': | |
| 5361 | + obj = { | |
| 5362 | + 'name': e2pdf.lang.get('Custom Labels (Y-Axis)'), | |
| 5363 | + 'type': 'textarea', | |
| 5364 | + 'value': e2pdf.helper.getString(properties[field]) | |
| 5365 | + }; | |
| 5366 | + break; | |
| 5367 | + case 'g_axis_text_callback_x': | |
| 5368 | + obj = { | |
| 5369 | + 'name': e2pdf.lang.get('Custom Labels (X-Axis)'), | |
| 5370 | + 'type': 'textarea', | |
| 5371 | + 'value': e2pdf.helper.getString(properties[field]) | |
| 5372 | + }; | |
| 5373 | + break; | |
| 5362 | 5374 | case 'g_colors': |
| 5363 | 5375 | obj = { |
| 5364 | 5376 | 'name': e2pdf.lang.get('Colors'), |
| 5365 | 5377 | 'type': 'textarea', |
| @@ -5365,8 +5377,80 @@ | ||
| 5365 | 5377 | 'type': 'textarea', |
| 5366 | 5378 | 'value': e2pdf.helper.getString(properties[field]) |
| 5367 | 5379 | }; |
| 5368 | 5380 | break; |
| 5381 | + case 'g_inner_radius': | |
| 5382 | + obj = { | |
| 5383 | + 'name': e2pdf.lang.get('Inner Radius'), | |
| 5384 | + 'type': 'text', | |
| 5385 | + 'value': e2pdf.helper.getFloat(properties[field]), | |
| 5386 | + 'atts': ['number', 'keep'] | |
| 5387 | + }; | |
| 5388 | + break; | |
| 5389 | + case 'g_start_angle': | |
| 5390 | + obj = { | |
| 5391 | + 'name': e2pdf.lang.get('Start Angle'), | |
| 5392 | + 'type': 'text', | |
| 5393 | + 'value': e2pdf.helper.getFloat(properties[field]), | |
| 5394 | + 'atts': ['number'] | |
| 5395 | + }; | |
| 5396 | + break; | |
| 5397 | + case 'g_grid_straight': | |
| 5398 | + obj = { | |
| 5399 | + 'name': e2pdf.lang.get('Straight'), | |
| 5400 | + 'type': 'checkbox', | |
| 5401 | + 'value': e2pdf.helper.getCheckbox(properties[field]), | |
| 5402 | + 'option': '1', | |
| 5403 | + }; | |
| 5404 | + break; | |
| 5405 | + case 'g_grid_dash': | |
| 5406 | + obj = { | |
| 5407 | + 'name': e2pdf.lang.get('Grid Dash'), | |
| 5408 | + 'type': 'text', | |
| 5409 | + 'value': e2pdf.helper.getFloat(properties[field]), | |
| 5410 | + 'atts': ['number'] | |
| 5411 | + }; | |
| 5412 | + break; | |
| 5413 | + case 'g_grid_dash_h': | |
| 5414 | + obj = { | |
| 5415 | + 'name': e2pdf.lang.get('Grid Dash (H)'), | |
| 5416 | + 'type': 'text', | |
| 5417 | + 'value': e2pdf.helper.getFloat(properties[field]), | |
| 5418 | + 'atts': ['number'] | |
| 5419 | + }; | |
| 5420 | + break; | |
| 5421 | + case 'g_grid_dash_v': | |
| 5422 | + obj = { | |
| 5423 | + 'name': e2pdf.lang.get('Grid Dash (V)'), | |
| 5424 | + 'type': 'text', | |
| 5425 | + 'value': e2pdf.helper.getFloat(properties[field]), | |
| 5426 | + 'atts': ['number'] | |
| 5427 | + }; | |
| 5428 | + break; | |
| 5429 | + case 'g_fill_opacity': | |
| 5430 | + obj = { | |
| 5431 | + 'name': e2pdf.lang.get('Fill Opacity'), | |
| 5432 | + 'type': 'text', | |
| 5433 | + 'value': e2pdf.helper.getFloat(properties[field]), | |
| 5434 | + 'atts': ['number', 'keep'] | |
| 5435 | + }; | |
| 5436 | + break; | |
| 5437 | + case 'g_axis_font_weight_h': | |
| 5438 | + obj = { | |
| 5439 | + 'name': e2pdf.lang.get('Bold'), | |
| 5440 | + 'type': 'checkbox', | |
| 5441 | + 'value': e2pdf.helper.getCheckbox(properties[field]), | |
| 5442 | + 'option': '1' | |
| 5443 | + }; | |
| 5444 | + break; | |
| 5445 | + case 'g_axis_font_weight_v': | |
| 5446 | + obj = { | |
| 5447 | + 'name': e2pdf.lang.get('Bold'), | |
| 5448 | + 'type': 'checkbox', | |
| 5449 | + 'value': e2pdf.helper.getCheckbox(properties[field]), | |
| 5450 | + 'option': '1' | |
| 5451 | + }; | |
| 5452 | + break; | |
| 5369 | 5453 | } |
| 5370 | 5454 | if (!obj.hasOwnProperty('key')) { |
| 5371 | 5455 | obj['key'] = field; |
| 5372 | 5456 | } |
| @@ -6425,8 +6509,12 @@ | ||
| 6425 | 6509 | e2pdf.properties.getField('g_label_font_size', el), |
| 6426 | 6510 | e2pdf.properties.getField('g_label_space', el), |
| 6427 | 6511 | e2pdf.properties.getField('g_label_v', el), |
| 6428 | 6512 | e2pdf.properties.getField('g_label_h', el), |
| 6513 | + e2pdf.properties.getField('g_show_labels', el), | |
| 6514 | + e2pdf.properties.getField('g_show_label_key', el), | |
| 6515 | + e2pdf.properties.getField('g_show_label_amount', el), | |
| 6516 | + e2pdf.properties.getField('g_show_label_percent', el), | |
| 6429 | 6517 | ], |
| 6430 | 6518 | 'position': 'left', |
| 6431 | 6519 | 'classes': [ |
| 6432 | 6520 | 'e2pdf-w100', |
| @@ -6433,8 +6521,12 @@ | ||
| 6433 | 6521 | 'e2pdf-w70 e2pdf-pr10', |
| 6434 | 6522 | 'e2pdf-w30', |
| 6435 | 6523 | 'e2pdf-w50 e2pdf-pr10', |
| 6436 | 6524 | 'e2pdf-w50', |
| 6525 | + 'e2pdf-pr10', | |
| 6526 | + 'e2pdf-pr10', | |
| 6527 | + 'e2pdf-pr10', | |
| 6528 | + 'e2pdf-pr10', | |
| 6437 | 6529 | ] |
| 6438 | 6530 | }; |
| 6439 | 6531 | obj['marker'] = { |
| 6440 | 6532 | 'name': e2pdf.lang.get('Markers'), |
| @@ -6507,9 +6599,12 @@ | ||
| 6507 | 6599 | e2pdf.properties.getField('g_line_dataset', el), |
| 6508 | 6600 | e2pdf.properties.getField('g_project_angle', el), |
| 6509 | 6601 | e2pdf.properties.getField('g_line_curve', el), |
| 6510 | 6602 | e2pdf.properties.getField('g_depth', el), |
| 6511 | - e2pdf.properties.getField('g_aspect_ratio', el) | |
| 6603 | + e2pdf.properties.getField('g_aspect_ratio', el), | |
| 6604 | + e2pdf.properties.getField('g_inner_radius', el), | |
| 6605 | + e2pdf.properties.getField('g_start_angle', el), | |
| 6606 | + e2pdf.properties.getField('g_fill_opacity', el) | |
| 6512 | 6607 | ], |
| 6513 | 6608 | 'position': 'left', |
| 6514 | 6609 | 'classes': [ |
| 6515 | 6610 | 'e2pdf-w50 e2pdf-pr10', |
| @@ -6518,9 +6613,12 @@ | ||
| 6518 | 6613 | 'e2pdf-w50', |
| 6519 | 6614 | 'e2pdf-w50 e2pdf-pr10', |
| 6520 | 6615 | 'e2pdf-w50', |
| 6521 | 6616 | 'e2pdf-w50 e2pdf-pr10', |
| 6522 | - 'e2pdf-w50' | |
| 6617 | + 'e2pdf-w50', | |
| 6618 | + 'e2pdf-w50 e2pdf-pr10', | |
| 6619 | + 'e2pdf-w50', | |
| 6620 | + 'e2pdf-w50 e2pdf-pr10', | |
| 6523 | 6621 | ] |
| 6524 | 6622 | }; |
| 6525 | 6623 | obj['grid'] = { |
| 6526 | 6624 | 'name': e2pdf.lang.get('Grid'), |
| @@ -6529,12 +6627,16 @@ | ||
| 6529 | 6627 | e2pdf.properties.getField('g_grid_subdivision_colour', el), |
| 6530 | 6628 | e2pdf.properties.getField('g_minimum_grid_spacing', el), |
| 6531 | 6629 | e2pdf.properties.getField('g_minimum_grid_spacing_h', el), |
| 6532 | 6630 | e2pdf.properties.getField('g_minimum_grid_spacing_v', el), |
| 6631 | + e2pdf.properties.getField('g_grid_dash', el), | |
| 6632 | + e2pdf.properties.getField('g_grid_dash_h', el), | |
| 6633 | + e2pdf.properties.getField('g_grid_dash_v', el), | |
| 6533 | 6634 | e2pdf.properties.getField('g_grid_division_h', el), |
| 6534 | 6635 | e2pdf.properties.getField('g_grid_division_v', el), |
| 6535 | 6636 | e2pdf.properties.getField('g_show_grid', el), |
| 6536 | - e2pdf.properties.getField('g_show_grid_subdivisions', el) | |
| 6637 | + e2pdf.properties.getField('g_show_grid_subdivisions', el), | |
| 6638 | + e2pdf.properties.getField('g_grid_straight', el) | |
| 6537 | 6639 | ], |
| 6538 | 6640 | 'position': 'right', |
| 6539 | 6641 | 'classes': [ |
| 6540 | 6642 | 'e2pdf-w100', |
| @@ -6541,11 +6643,15 @@ | ||
| 6541 | 6643 | 'e2pdf-w100', |
| 6542 | 6644 | 'e2pdf-w100', |
| 6543 | 6645 | 'e2pdf-w50 e2pdf-pr10', |
| 6544 | 6646 | 'e2pdf-w50', |
| 6647 | + 'e2pdf-w100', | |
| 6545 | 6648 | 'e2pdf-w50 e2pdf-pr10', |
| 6546 | 6649 | 'e2pdf-w50', |
| 6650 | + 'e2pdf-w50 e2pdf-pr10', | |
| 6651 | + 'e2pdf-w50', | |
| 6547 | 6652 | 'e2pdf-pr10', |
| 6653 | + 'e2pdf-pr10', | |
| 6548 | 6654 | 'e2pdf-pr10' |
| 6549 | 6655 | ] |
| 6550 | 6656 | }; |
| 6551 | 6657 | obj['axis'] = { |
| @@ -6566,8 +6672,11 @@ | ||
| 6566 | 6672 | }; |
| 6567 | 6673 | obj['axis_v'] = { |
| 6568 | 6674 | 'name': e2pdf.lang.get('Axis (V)'), |
| 6569 | 6675 | 'fields': [ |
| 6676 | + e2pdf.properties.getField('g_axis_colour_v', el), | |
| 6677 | + e2pdf.properties.getField('g_axis_font_size_v', el), | |
| 6678 | + e2pdf.properties.getField('g_axis_font_weight_v', el), | |
| 6570 | 6679 | e2pdf.properties.getField('g_axis_stroke_width_v', el), |
| 6571 | 6680 | e2pdf.properties.getField('g_show_axis_v', el), |
| 6572 | 6681 | e2pdf.properties.getField('g_show_axis_text_v', el), |
| 6573 | 6682 | e2pdf.properties.getField('g_axis_min_v', el), |
| @@ -6581,8 +6690,11 @@ | ||
| 6581 | 6690 | e2pdf.properties.getField('g_units_x', el), |
| 6582 | 6691 | ], |
| 6583 | 6692 | 'position': 'right', |
| 6584 | 6693 | 'classes': [ |
| 6694 | + 'e2pdf-w60 e2pdf-pr10', | |
| 6695 | + 'e2pdf-w40', | |
| 6696 | + 'e2pdf-w100', | |
| 6585 | 6697 | 'e2pdf-w33 e2pdf-pr10', |
| 6586 | 6698 | 'e2pdf-w33 e2pdf-sublabel', |
| 6587 | 6699 | 'e2pdf-w33 e2pdf-pl10 e2pdf-sublabel', |
| 6588 | 6700 | 'e2pdf-w33 e2pdf-pr10', |
| @@ -6598,8 +6710,11 @@ | ||
| 6598 | 6710 | }; |
| 6599 | 6711 | obj['axis_h'] = { |
| 6600 | 6712 | 'name': e2pdf.lang.get('Axis (H)'), |
| 6601 | 6713 | 'fields': [ |
| 6714 | + e2pdf.properties.getField('g_axis_colour_h', el), | |
| 6715 | + e2pdf.properties.getField('g_axis_font_size_h', el), | |
| 6716 | + e2pdf.properties.getField('g_axis_font_weight_h', el), | |
| 6602 | 6717 | e2pdf.properties.getField('g_axis_stroke_width_h', el), |
| 6603 | 6718 | e2pdf.properties.getField('g_show_axis_h', el), |
| 6604 | 6719 | e2pdf.properties.getField('g_show_axis_text_h', el), |
| 6605 | 6720 | e2pdf.properties.getField('g_axis_min_h', el), |
| @@ -6613,8 +6728,11 @@ | ||
| 6613 | 6728 | e2pdf.properties.getField('g_units_y', el), |
| 6614 | 6729 | ], |
| 6615 | 6730 | 'position': 'right', |
| 6616 | 6731 | 'classes': [ |
| 6732 | + 'e2pdf-w60 e2pdf-pr10', | |
| 6733 | + 'e2pdf-w40', | |
| 6734 | + 'e2pdf-w100', | |
| 6617 | 6735 | 'e2pdf-w33 e2pdf-pr10', |
| 6618 | 6736 | 'e2pdf-w33 e2pdf-sublabel', |
| 6619 | 6737 | 'e2pdf-w33 e2pdf-pl10 e2pdf-sublabel', |
| 6620 | 6738 | 'e2pdf-w33 e2pdf-pr10', |
| @@ -6753,8 +6871,10 @@ | ||
| 6753 | 6871 | 'fields': [ |
| 6754 | 6872 | e2pdf.properties.getField('g_key_sep', el), |
| 6755 | 6873 | e2pdf.properties.getField('g_array_sep', el), |
| 6756 | 6874 | e2pdf.properties.getField('g_sub_array_sep', el), |
| 6875 | + e2pdf.properties.getField('g_axis_text_callback_y', el), | |
| 6876 | + e2pdf.properties.getField('g_axis_text_callback_x', el), | |
| 6757 | 6877 | e2pdf.properties.getField('g_legends', el), |
| 6758 | 6878 | e2pdf.properties.getField('g_colors', el), |
| 6759 | 6879 | e2pdf.properties.getField('value', el), |
| 6760 | 6880 | e2pdf.properties.getField('g_multiline', el), |
| @@ -6769,10 +6889,12 @@ | ||
| 6769 | 6889 | 'classes': [ |
| 6770 | 6890 | 'e2pdf-w33 e2pdf-pr10', |
| 6771 | 6891 | 'e2pdf-w33', |
| 6772 | 6892 | 'e2pdf-w33 e2pdf-pl10', |
| 6773 | - 'e2pdf-w100', | |
| 6774 | - 'e2pdf-w100', | |
| 6893 | + 'e2pdf-w50 e2pdf-pr10', | |
| 6894 | + 'e2pdf-w50', | |
| 6895 | + 'e2pdf-w50 e2pdf-pr10', | |
| 6896 | + 'e2pdf-w50', | |
| 6775 | 6897 | 'e2pdf-w100 e2pdf-strong-label', |
| 6776 | 6898 | 'e2pdf-w30 e2pdf-pr10 e2pdf-hide-label', |
| 6777 | 6899 | 'e2pdf-w30 e2pdf-pr10', |
| 6778 | 6900 | 'e2pdf-w40 e2pdf-align-right e2pdf-small e2pdf-mt6 e2pdf-pl10 e2pdf-pr10', |
| @@ -6953,8 +7075,9 @@ | ||
| 6953 | 7075 | } |
| 6954 | 7076 | var field = ''; |
| 6955 | 7077 | var label = ''; |
| 6956 | 7078 | var wrap = ''; |
| 7079 | + var hidden = ''; | |
| 6957 | 7080 | if (group_field.type === 'text') { |
| 6958 | 7081 | label = jQuery('<div>', {'class': 'e2pdf-small e2pdf-label'}).html(group_field.name + ":"); |
| 6959 | 7082 | field = jQuery('<input>', {'type': 'text', 'class': 'e2pdf-w100', 'name': group_field.key, 'value': group_field.value}); |
| 6960 | 7083 | } else if (group_field.type === 'hidden') { |
| @@ -6961,9 +7084,9 @@ | ||
| 6961 | 7084 | field = jQuery('<input>', {'type': 'hidden', 'name': group_field.key, 'value': group_field.value}); |
| 6962 | 7085 | } else if (group_field.type === 'textarea') { |
| 6963 | 7086 | label = jQuery('<div>', {'class': 'e2pdf-small e2pdf-label'}).html(group_field.name + ":"); |
| 6964 | 7087 | var rows = '5'; |
| 6965 | - if (group_field.key == 'g_legends' || group_field.key == 'g_colors') { | |
| 7088 | + if (group_field.key == 'g_legends' || group_field.key == 'g_colors' || group_field.key == 'g_axis_text_callback_x' || group_field.key == 'g_axis_text_callback_y') { | |
| 6966 | 7089 | rows = '3'; |
| 6967 | 7090 | } |
| 6968 | 7091 | field = jQuery('<textarea>', {'name': group_field.key, 'class': 'e2pdf-w100', 'rows': rows}).val(group_field.value); |
| 6969 | 7092 | } else if (group_field.type === 'checkbox') { |
| @@ -6972,8 +7095,15 @@ | ||
| 6972 | 7095 | field = jQuery('<input>', {'type': 'checkbox', 'class': 'e2pdf-ib', 'name': group_field.key, 'value': group_field.option}); |
| 6973 | 7096 | if (group_field.value == group_field.option) { |
| 6974 | 7097 | field.prop('checked', true); |
| 6975 | 7098 | } |
| 7099 | + if (jQuery.inArray('keep', group_field.atts) !== -1) { | |
| 7100 | + hidden = jQuery('<input>', { | |
| 7101 | + type: 'hidden', | |
| 7102 | + name: group_field.key, | |
| 7103 | + value: '0' | |
| 7104 | + }); | |
| 7105 | + } | |
| 6976 | 7106 | } else if (group_field.type === 'color') { |
| 6977 | 7107 | wrap = jQuery('<div>', {'class': 'e2pdf-colorpicker-wr'}); |
| 6978 | 7108 | label = jQuery('<div>', {'class': 'e2pdf-small e2pdf-label'}).html(group_field.name + ":"); |
| 6979 | 7109 | field = jQuery('<input>', {'class': 'e2pdf-color-picker e2pdf-color-picker-load e2pdf-w100', 'type': 'text', 'name': group_field.key, 'value': group_field.value}); |
| @@ -7027,8 +7157,11 @@ | ||
| 7027 | 7157 | } else { |
| 7028 | 7158 | wrap.prepend(field); |
| 7029 | 7159 | } |
| 7030 | 7160 | if (group_field.type === 'checkbox') { |
| 7161 | + if (hidden) { | |
| 7162 | + wrap.prepend(hidden); | |
| 7163 | + } | |
| 7031 | 7164 | wrap.append(" " + label); |
| 7032 | 7165 | if (classes.includes('e2pdf-sublabel')) { |
| 7033 | 7166 | var sublabel = jQuery('<div>', {'class': 'e2pdf-small e2pdf-label'}).html(" "); |
| 7034 | 7167 | grid.append(jQuery('<div>', {'class': 'e2pdf-ib ' + classes}).append(sublabel, wrap)); |
| @@ -7067,12 +7200,9 @@ | ||
| 7067 | 7200 | if (jQuery.inArray('keep', group_field['atts']) === -1 && data.hasOwnProperty(property)) { |
| 7068 | 7201 | switch (group_field['type']) { |
| 7069 | 7202 | case 'text': |
| 7070 | 7203 | if ((jQuery.inArray('number', group_field['atts']) !== -1 && data[property] == '0') || !data[property]) { |
| 7071 | - // backward compatibility | |
| 7072 | - if (property !== 'left' && property !== 'top' && property !== 'g_legend_entry_height' && property !== 'g_bar_space') { | |
| 7073 | - delete data[property]; | |
| 7074 | - } | |
| 7204 | + delete data[property]; | |
| 7075 | 7205 | } |
| 7076 | 7206 | break; |
| 7077 | 7207 | case 'color': |
| 7078 | 7208 | case 'select': |
| @@ -7621,11 +7751,11 @@ | ||
| 7621 | 7751 | if (ui.draggable.hasClass('e2pdf-clone')) { |
| 7622 | 7752 | var type = jQuery(ui.draggable).attr('data-type'); |
| 7623 | 7753 | var page = jQuery(this).closest('.e2pdf-page'); |
| 7624 | 7754 | var pos = { |
| 7625 | - top: Math.round(Math.max(0, (jQuery(ui.helper).offset().top - jQuery(this).offset().top) / e2pdf.zoom.zoom - 1)), | |
| 7626 | - left: Math.round(Math.max(0, (jQuery(ui.helper).offset().left - jQuery(this).offset().left) / e2pdf.zoom.zoom - 1)), | |
| 7627 | - right: Math.round(Math.min(0, ((parseFloat(jQuery(ui.helper).css('width')) + jQuery(ui.helper).offset().left - 2) - (jQuery(this).offset().left + parseFloat(jQuery(this).css('width')))) / e2pdf.zoom.zoom)) | |
| 7755 | + top: Math.round(Math.max(0, (jQuery(ui.helper).offset().top - jQuery(this).offset().top) / e2pdf.zoom.scale - 1)), | |
| 7756 | + left: Math.round(Math.max(0, (jQuery(ui.helper).offset().left - jQuery(this).offset().left) / e2pdf.zoom.scale - 1)), | |
| 7757 | + right: Math.round(Math.min(0, ((parseFloat(jQuery(ui.helper).css('width')) + jQuery(ui.helper).offset().left - 2) - (jQuery(this).offset().left + parseFloat(jQuery(this).css('width')))) / e2pdf.zoom.scale)) | |
| 7628 | 7758 | }; |
| 7629 | 7759 | if (pos.left < 0 || pos.right > 0 || pos.top < 0) { |
| 7630 | 7760 | return false; |
| 7631 | 7761 | } |
| @@ -7865,9 +7995,9 @@ | ||
| 7865 | 7995 | )); |
| 7866 | 7996 | } |
| 7867 | 7997 | |
| 7868 | 7998 | menu.find('ul.e2pdf-context-menu').append( |
| 7869 | - jQuery('<li>', {'class': 'e2pdf-inner-context-menu e2pdf-paste-menu e2pdf-hide'}).append( | |
| 7999 | + jQuery('<li>', {'class': 'e2pdf-inner-context-menu'}).append( | |
| 7870 | 8000 | jQuery('<a>', {'href': 'javascript:void(0);'}).append(jQuery('<span>').html(e2pdf.lang.get('Quick Props')), jQuery('<span>', {'class': 'e2pdf-inner-context-arrow'})) |
| 7871 | 8001 | , |
| 7872 | 8002 | jQuery('<ul>', {'class': 'e2pdf-sub-context-menu e2pdf-quickprops-menu'}).append( |
| 7873 | 8003 | jQuery('<li>').append( |
| @@ -7994,16 +8124,16 @@ | ||
| 7994 | 8124 | } |
| 7995 | 8125 | } |
| 7996 | 8126 | parent.css('z-index', '1'); |
| 7997 | 8127 | menu.hide().appendTo(parent); |
| 7998 | - var pos_x = (e.pageX - parent.offset().left) / e2pdf.zoom.zoom; | |
| 7999 | - if ((parent.closest('.e2pdf-tpl').width() - 20 < e.pageX - parent.closest('.e2pdf-tpl').offset().left + (menu.width() * e2pdf.zoom.zoom * 2)) && (e.pageX - parent.closest('.e2pdf-tpl').offset().left > (menu.width() * e2pdf.zoom.zoom * 2))) { | |
| 8000 | - pos_x = pos_x - menu.width(); | |
| 8128 | + var pos_x = (e.pageX - parent.offset().left) / e2pdf.zoom.scale; | |
| 8129 | + if ((parent.closest('.e2pdf-tpl').width() - 20 < e.pageX - parent.closest('.e2pdf-tpl').offset().left + menu.width()) && (e.pageX - parent.closest('.e2pdf-tpl').offset().left > menu.width())) { | |
| 8130 | + pos_x = pos_x - (menu.width() / e2pdf.zoom.scale); | |
| 8001 | 8131 | menu.find('ul.e2pdf-context-menu').addClass('e2pdf-context-right'); |
| 8002 | 8132 | } |
| 8003 | - var pos_y = (e.pageY - parent.offset().top) / e2pdf.zoom.zoom; | |
| 8004 | - if ((parent.closest('.e2pdf-tpl').height() - 20 < e.pageY - parent.closest('.e2pdf-tpl').offset().top + (menu.height() * e2pdf.zoom.zoom * 2)) && (e.pageY - parent.closest('.e2pdf-tpl').offset().top > (menu.height() * e2pdf.zoom.zoom * 2))) { | |
| 8005 | - pos_y = pos_y - menu.height(); | |
| 8133 | + var pos_y = (e.pageY - parent.offset().top) / e2pdf.zoom.scale; | |
| 8134 | + if ((parent.closest('.e2pdf-tpl').height() - 20 < e.pageY - parent.closest('.e2pdf-tpl').offset().top + menu.height()) && (e.pageY - parent.closest('.e2pdf-tpl').offset().top > menu.height())) { | |
| 8135 | + pos_y = pos_y - (menu.height() / e2pdf.zoom.scale); | |
| 8006 | 8136 | menu.addClass('e2pdf-context-bottom'); |
| 8007 | 8137 | } |
| 8008 | 8138 | menu.css({top: pos_y + "px", left: pos_x + "px"}); |
| 8009 | 8139 | menu.show(); |
| @@ -8079,10 +8209,10 @@ | ||
| 8079 | 8209 | e2pdf.element.unselect(); |
| 8080 | 8210 | jQuery('.e2pdf-guide-v, .e2pdf-guide-h').hide(); |
| 8081 | 8211 | }, |
| 8082 | 8212 | drag: function (ev, ui) { |
| 8083 | - var left = (ev.clientX - e2pdf.zoom.click.x + ui.originalPosition.left) / e2pdf.zoom.zoom; | |
| 8084 | - var top = (ev.clientY - e2pdf.zoom.click.y + ui.originalPosition.top) / e2pdf.zoom.zoom; | |
| 8213 | + var left = (ev.clientX - e2pdf.zoom.click.x + ui.originalPosition.left) / e2pdf.zoom.scale; | |
| 8214 | + var top = (ev.clientY - e2pdf.zoom.click.y + ui.originalPosition.top) / e2pdf.zoom.scale; | |
| 8085 | 8215 | left = Math.min(left, e2pdf.static.drag.max_left); |
| 8086 | 8216 | top = Math.min(top, e2pdf.static.drag.max_top); |
| 8087 | 8217 | ui.position = { |
| 8088 | 8218 | left: Math.max(e2pdf.static.drag.min_left, left), |
| @@ -8153,8 +8283,11 @@ | ||
| 8153 | 8283 | jQuery('.e2pdf-guide-v').hide(); |
| 8154 | 8284 | } |
| 8155 | 8285 | }, |
| 8156 | 8286 | start: function (ev, ui) { |
| 8287 | + if (ev.originalEvent && ev.originalEvent.detail >= 2) { | |
| 8288 | + return false; | |
| 8289 | + } | |
| 8157 | 8290 | e2pdf.element.select(jQuery(this)); |
| 8158 | 8291 | e2pdf.static.drag.min_left = 0; |
| 8159 | 8292 | e2pdf.static.drag.max_left = jQuery(this).closest('.e2pdf-page').width(); |
| 8160 | 8293 | e2pdf.static.drag.min_top = 0; |
| @@ -8818,8 +8951,14 @@ | ||
| 8818 | 8951 | // Bar |
| 8819 | 8952 | properties['g_bar_width'] = '0'; |
| 8820 | 8953 | properties['g_bar_width_min'] = '1'; |
| 8821 | 8954 | properties['g_bar_space'] = '10'; |
| 8955 | + properties['g_show_labels'] = '1'; | |
| 8956 | + properties['g_show_label_key'] = '1'; | |
| 8957 | + properties['g_inner_radius'] = '0.5'; | |
| 8958 | + properties['g_fill_opacity'] = '1'; | |
| 8959 | + properties['g_axis_text_space_v'] = '2'; | |
| 8960 | + properties['g_axis_text_space_h'] = '2'; | |
| 8822 | 8961 | } else { |
| 8823 | 8962 | // backward compatibility |
| 8824 | 8963 | if (!properties.hasOwnProperty('g_depth')) { |
| 8825 | 8964 | properties['g_depth'] = '40'; |
| @@ -8838,8 +8977,27 @@ | ||
| 8838 | 8977 | } |
| 8839 | 8978 | if (!properties.hasOwnProperty('g_bar_space')) { |
| 8840 | 8979 | properties['g_bar_space'] = '10'; |
| 8841 | 8980 | } |
| 8981 | + // backward compatibility | |
| 8982 | + if (!properties.hasOwnProperty('g_show_labels')) { | |
| 8983 | + properties['g_show_labels'] = '1'; | |
| 8984 | + } | |
| 8985 | + if (!properties.hasOwnProperty('g_show_label_key')) { | |
| 8986 | + properties['g_show_label_key'] = '1'; | |
| 8987 | + } | |
| 8988 | + if (!properties.hasOwnProperty('g_inner_radius')) { | |
| 8989 | + properties['g_inner_radius'] = '0.5'; | |
| 8990 | + } | |
| 8991 | + if (!properties.hasOwnProperty('g_fill_opacity')) { | |
| 8992 | + properties['g_fill_opacity'] = '1'; | |
| 8993 | + } | |
| 8994 | + if (!properties.hasOwnProperty('g_axis_text_space_v')) { | |
| 8995 | + properties['g_axis_text_space_v'] = '2'; | |
| 8996 | + } | |
| 8997 | + if (!properties.hasOwnProperty('g_axis_text_space_h')) { | |
| 8998 | + properties['g_axis_text_space_h'] = '2'; | |
| 8999 | + } | |
| 8842 | 9000 | } |
| 8843 | 9001 | var element = jQuery('<div>', {'class': 'e2pdf-el-wrapper e2pdf-loader e2pdf-resizable', 'width': '250px', height: '150px'}).append( |
| 8844 | 9002 | jQuery('<img>', {'class': 'e2pdf-graph e2pdf-inner-element'}), |
| 8845 | 9003 | jQuery('<i>', {'class': 'e2pdf-drag'}) |
| @@ -8936,9 +9094,26 @@ | ||
| 8936 | 9094 | history.push(el.clone(true)); |
| 8937 | 9095 | e2pdf.history.set('element_change', history); |
| 8938 | 9096 | }); |
| 8939 | 9097 | var el_inner = el.find('.e2pdf-inner-element'); |
| 8940 | - el_inner.focus(); | |
| 9098 | + if (el_inner.is('div.e2pdf-html')) { | |
| 9099 | + var node = el_inner.get(0); | |
| 9100 | + if (node) { | |
| 9101 | + node.focus(); | |
| 9102 | + if (window.getSelection && document.createRange) { | |
| 9103 | + var range = document.createRange(); | |
| 9104 | + var selection = window.getSelection(); | |
| 9105 | + range.selectNodeContents(node); | |
| 9106 | + range.collapse(false); | |
| 9107 | + selection.removeAllRanges(); | |
| 9108 | + selection.addRange(range); | |
| 9109 | + } | |
| 9110 | + } else { | |
| 9111 | + el_inner.focus(); | |
| 9112 | + } | |
| 9113 | + } else { | |
| 9114 | + el_inner.focus(); | |
| 9115 | + } | |
| 8941 | 9116 | el.addClass('e2pdf-focused'); |
| 8942 | 9117 | }, |
| 8943 | 9118 | // e2pdf.element.hide |
| 8944 | 9119 | hide: function (el) { |
| @@ -9688,23 +9863,22 @@ | ||
| 9688 | 9863 | } |
| 9689 | 9864 | } |
| 9690 | 9865 | }, |
| 9691 | 9866 | zoom: { |
| 9692 | - zoom: 1, | |
| 9867 | + scale: 1, | |
| 9693 | 9868 | click: { |
| 9694 | 9869 | x: 0, |
| 9695 | 9870 | y: 0 |
| 9696 | 9871 | }, |
| 9697 | 9872 | apply: function (el) { |
| 9698 | - jQuery('.e2pdf-tpl').removeClass(function (index, className) { | |
| 9699 | - return (className.match(/(^|\s)e2pdf-z\S+/g) || []).join(' '); | |
| 9700 | - }); | |
| 9701 | - if (el.val() !== '100') { | |
| 9702 | - jQuery('.e2pdf-tpl').addClass("e2pdf-z" + el.val()); | |
| 9703 | - } | |
| 9704 | - | |
| 9705 | - e2pdf.zoom.zoom = el.val() / 100; | |
| 9706 | - jQuery('.e2pdf-tpl').scrollLeft(((jQuery('.e2pdf-tpl-inner').width() * e2pdf.zoom.zoom) - jQuery('.e2pdf-tpl').width()) / 2); | |
| 9873 | + const scale = Number(el.val()) / 100; | |
| 9874 | + e2pdf.zoom.scale = scale; | |
| 9875 | + const tpl = jQuery('.e2pdf-tpl'); | |
| 9876 | + const inner = jQuery('.e2pdf-tpl-inner'); | |
| 9877 | + document.documentElement.style.setProperty('--e2pdf-scale', scale); | |
| 9878 | + document.documentElement.style.setProperty('--e2pdf-scale-width', `${Math.max(100, 100 / scale)}%`); | |
| 9879 | + tpl.toggleClass('e2pdf-zoom', scale !== 1); | |
| 9880 | + tpl.scrollLeft(((inner.width() * e2pdf.zoom.scale) - tpl.width()) / 2); | |
| 9707 | 9881 | } |
| 9708 | 9882 | } |
| 9709 | 9883 | }; |
| 9710 | 9884 | jQuery(window).resize(function () { |
| @@ -9810,8 +9984,20 @@ | ||
| 9810 | 9984 | if (parent.find('.e2pdf-argument').length > 1) { |
| 9811 | 9985 | parent.find('.e2pdf-argument').last().remove(); |
| 9812 | 9986 | } |
| 9813 | 9987 | }); |
| 9988 | + jQuery(document).on('click', '.e2pdf-search-replace-add', function (e) { | |
| 9989 | + var parent = jQuery('.e2pdf-search-replaces').first(); | |
| 9990 | + var search_replace = parent.find('.e2pdf-search-replace').first().clone(); | |
| 9991 | + search_replace.find('textarea').val(''); | |
| 9992 | + search_replace.appendTo(parent); | |
| 9993 | + }); | |
| 9994 | + jQuery(document).on('click', '.e2pdf-search-replace-delete', function (e) { | |
| 9995 | + var parent = jQuery(this).closest('.e2pdf-search-replace'); | |
| 9996 | + if (parent) { | |
| 9997 | + parent.remove(); | |
| 9998 | + } | |
| 9999 | + }); | |
| 9814 | 10000 | jQuery(document).on('click', '.e2pdf-action-add', function (e) { |
| 9815 | 10001 | var actions = jQuery(this).closest('.e2pdf-actions-wrapper').find('.e2pdf-actions'); |
| 9816 | 10002 | var form = jQuery(this).closest('form'); |
| 9817 | 10003 | if (form.attr('id') === 'e2pdf-tpl-actions') { |
| @@ -10214,9 +10400,9 @@ | ||
| 10214 | 10400 | data['dataset'] = jQuery(this).closest('.e2pdf-select2-wrapper').find('select').first().val(); |
| 10215 | 10401 | data['name'] = jQuery(this).closest('.e2pdf-select2-wrapper').find('select').first().attr('name'); |
| 10216 | 10402 | e2pdf.request.submitRequest('e2pdf_datasets_refresh', jQuery(this), data); |
| 10217 | 10403 | }); |
| 10218 | - jQuery(document).on('change', 'fieldset.e2pdf-export-dataset input[type="checkbox"]', function (e) { | |
| 10404 | + jQuery(document).on('change', 'fieldset.e2pdf-fieldset input[type="checkbox"]', function (e) { | |
| 10219 | 10405 | if (jQuery(this).is(':checked')) { |
| 10220 | 10406 | if (jQuery(this).val() == '') { |
| 10221 | 10407 | jQuery(this).closest('fieldset').find('input[type="checkbox"]').prop('checked', true); |
| 10222 | 10408 | } |
| @@ -10495,13 +10681,8 @@ | ||
| 10495 | 10681 | jQuery('html').addClass('e2pdf-loading'); |
| 10496 | 10682 | var data = {}; |
| 10497 | 10683 | e2pdf.request.submitRequest('e2pdf_deactivate_all_templates', jQuery(this), data); |
| 10498 | 10684 | }); |
| 10499 | - jQuery(document).on('click', '#e2pdf-restore-license-key', function (e) { | |
| 10500 | - var data = {}; | |
| 10501 | - jQuery(this).html(e2pdf.lang.get('In Progress...')); | |
| 10502 | - e2pdf.request.submitRequest('e2pdf_restore_license_key', jQuery(this), data); | |
| 10503 | - }); | |
| 10504 | 10685 | jQuery(document).on('click', '.e2pdf-confirmation-confirm', function (e) { |
| 10505 | 10686 | jQuery(this).closest('.e2pdf-confirmation').remove(); |
| 10506 | 10687 | jQuery('.e2pdf-w-reupload').attr('disabled', false); |
| 10507 | 10688 | jQuery('.e2pdf-reupload-pdf').click(); |
| @@ -10528,42 +10709,34 @@ | ||
| 10528 | 10709 | }); |
| 10529 | 10710 | jQuery(document).on('change keyup', '.e2pdf-settings-template-change', function (e) { |
| 10530 | 10711 | e2pdf.event.fire('after.settings.template.change'); |
| 10531 | 10712 | }); |
| 10532 | - jQuery(document).on('keyup', '.e2pdf-export-dataset-search', function (e) { | |
| 10533 | - var field_key = jQuery(this).attr('field'); | |
| 10534 | - var search = jQuery('.e2pdf-export-dataset-search[field="' + field_key + '"]').val(); | |
| 10535 | - var dataset_field = jQuery('.e2pdf-export-dataset[name="' + field_key + '"]'); | |
| 10536 | - var options = dataset_field.data('options'); | |
| 10713 | + jQuery(document).on('keyup', '.e2pdf-fieldset-filter', function (e) { | |
| 10714 | + var form = jQuery(this).closest('form'); | |
| 10715 | + var field = jQuery(this).attr('field'); | |
| 10716 | + var search = jQuery(this).val(); | |
| 10717 | + var fieldset = jQuery(this).closest('.e2pdf-fieldset-wrapper').find('.e2pdf-fieldset[name="' + field + '"]').first(); | |
| 10718 | + var options = fieldset.data('options'); | |
| 10537 | 10719 | var regex = new RegExp(search, "gi"); |
| 10538 | - var selected = 0; | |
| 10539 | - dataset_field.empty(); | |
| 10720 | + fieldset.empty(); | |
| 10540 | 10721 | jQuery.each(options, function (i) { |
| 10541 | 10722 | var option = options[i]; |
| 10542 | 10723 | if (i == 0 || option.value.match(regex) !== null) { |
| 10543 | - if (e2pdf.url.get('action') == 'bulk') { | |
| 10544 | - dataset_field.append(jQuery('<div>', {'class': 'e2pdf-ib e2pdf-w100'}).append(jQuery('<label>').html(option.value).prepend(jQuery('<input>', {'name': field_key + '[]', 'type': 'checkbox', 'value': option.key})))); | |
| 10545 | - } else { | |
| 10546 | - dataset_field.append(jQuery('<option>', {'value': option.key}).html(option.value)); | |
| 10547 | - if ((selected == 0 && i !== 0) || (search === '' && i === 0)) { | |
| 10548 | - dataset_field.val(option.key); | |
| 10549 | - selected = 1; | |
| 10550 | - } | |
| 10551 | - } | |
| 10724 | + fieldset.append(jQuery('<div>', {'class': 'e2pdf-ib e2pdf-w100'}).append(jQuery('<label>').html(option.value).prepend(jQuery('<input>', {'name': field + '[]', 'type': 'checkbox', 'value': option.key})))); | |
| 10552 | 10725 | } |
| 10553 | 10726 | }); |
| 10554 | - dataset_field.find('input[type="checkbox"][value=""]').prop('checked', true).trigger('change'); | |
| 10555 | - if (dataset_field.find('input[type="checkbox"]').length > 1) { | |
| 10556 | - jQuery('.e2pdf-export-form-submit').attr('disabled', false); | |
| 10727 | + fieldset.find('input[type="checkbox"][value=""]').prop('checked', true).trigger('change'); | |
| 10728 | + if (fieldset.find('input[type="checkbox"]').length > 1) { | |
| 10729 | + form.find('.e2pdf-submit-form').attr('disabled', false); | |
| 10557 | 10730 | } else { |
| 10558 | - dataset_field.find('input[type="checkbox"]').attr('disabled', true); | |
| 10559 | - jQuery('.e2pdf-export-form-submit').attr('disabled', true); | |
| 10731 | + fieldset.find('input[type="checkbox"]').attr('disabled', true); | |
| 10732 | + form.find('.e2pdf-submit-form').attr('disabled', true); | |
| 10560 | 10733 | } |
| 10561 | - if (this.datasetLoad) { | |
| 10562 | - clearTimeout(this.datasetLoad); | |
| 10734 | + if (this.changeTrigger) { | |
| 10735 | + clearTimeout(this.changeTrigger); | |
| 10563 | 10736 | } |
| 10564 | - this.datasetLoad = setTimeout(function () { | |
| 10565 | - dataset_field.trigger('change'); | |
| 10737 | + this.changeTrigger = setTimeout(function () { | |
| 10738 | + fieldset.trigger('change'); | |
| 10566 | 10739 | }, 1000); |
| 10567 | 10740 | }); |
| 10568 | 10741 | jQuery(document).on('change', 'select[name="preset"]', function (e) { |
| 10569 | 10742 | if (jQuery(this).val() !== '') { |
| @@ -10844,9 +11017,9 @@ | ||
| 10844 | 11017 | if (type === "mousedown") { |
| 10845 | 11018 | m[ i ]._activate.call(m[ i ], event); |
| 10846 | 11019 | } |
| 10847 | 11020 | m[ i ].offset = m[ i ].element.offset(); |
| 10848 | - m[ i ].proportions({width: m[ i ].element[ 0 ].offsetWidth * e2pdf.zoom.zoom, height: m[ i ].element[ 0 ].offsetHeight * e2pdf.zoom.zoom}); | |
| 11021 | + m[ i ].proportions({width: m[ i ].element[ 0 ].offsetWidth * e2pdf.zoom.scale, height: m[ i ].element[ 0 ].offsetHeight * e2pdf.zoom.scale}); | |
| 10849 | 11022 | } |
| 10850 | 11023 | }; |
| 10851 | 11024 | jQuery('.e2pdf-tpl').data('data-type', 'e2pdf-tpl'); |
| 10852 | 11025 | var actions = JSON.parse(jQuery('.e2pdf-load-tpl').find('.e2pdf-data-actions').val()); |
| @@ -10892,17 +11065,17 @@ | ||
| 10892 | 11065 | e2pdf.font.line(el, jQuery('#e2pdf-line-height')); |
| 10893 | 11066 | e2pdf.font.fontcolor(el, jQuery('#e2pdf-font-color')); |
| 10894 | 11067 | e2pdf.properties.render(el); |
| 10895 | 11068 | el.css('z-index', 1); |
| 10896 | - if (e2pdf.zoom.zoom != 1) { | |
| 11069 | + if (e2pdf.zoom.scale != 1) { | |
| 10897 | 11070 | el.css({ |
| 10898 | - 'transform': 'scale(' + e2pdf.zoom.zoom + ')', | |
| 11071 | + 'transform': 'scale(' + e2pdf.zoom.scale + ')', | |
| 10899 | 11072 | 'transform-origin': '0 0' |
| 10900 | 11073 | }); |
| 10901 | 11074 | } |
| 10902 | 11075 | |
| 10903 | - var w = el.width() * e2pdf.zoom.zoom; | |
| 10904 | - var h = el.height() * e2pdf.zoom.zoom; | |
| 11076 | + var w = el.width() * e2pdf.zoom.scale; | |
| 11077 | + var h = el.height() * e2pdf.zoom.scale; | |
| 10905 | 11078 | e2pdf.static.guide.x = Math.round(w / 2); |
| 10906 | 11079 | e2pdf.static.guide.y = Math.round(h / 2); |
| 10907 | 11080 | jQuery('.e2pdf-be').draggable('option', 'cursorAt', { |
| 10908 | 11081 | left: Math.round(w / 2), |
| @@ -10921,10 +11094,10 @@ | ||
| 10921 | 11094 | drag: function (ev, ui) { |
| 10922 | 11095 | if (e2pdf.static.drag.page !== null) { |
| 10923 | 11096 | var pos = {left: ev.originalEvent.pageX - e2pdf.static.guide.x, top: ev.originalEvent.pageY - e2pdf.static.guide.y}; |
| 10924 | 11097 | var guides = {top: {dist: e2pdf.static.guide.distance + 1}, left: {dist: e2pdf.static.guide.distance + 1}}; |
| 10925 | - var w = parseFloat(jQuery(ui.helper).css('width')) * e2pdf.zoom.zoom; | |
| 10926 | - var h = parseFloat(jQuery(ui.helper).css('height')) * e2pdf.zoom.zoom; | |
| 11098 | + var w = parseFloat(jQuery(ui.helper).css('width')) * e2pdf.zoom.scale; | |
| 11099 | + var h = parseFloat(jQuery(ui.helper).css('height')) * e2pdf.zoom.scale; | |
| 10927 | 11100 | var el_guides = e2pdf.guide.calc(null, pos, w, h, true); |
| 10928 | 11101 | jQuery.each(e2pdf.static.guide.guides, function (i, guide) { |
| 10929 | 11102 | jQuery.each(el_guides, function (i, elemGuide) { |
| 10930 | 11103 | if (guide.type == elemGuide.type) { |
| @@ -10938,9 +11111,9 @@ | ||
| 10938 | 11111 | } |
| 10939 | 11112 | }); |
| 10940 | 11113 | }); |
| 10941 | 11114 | if (guides.top.dist <= e2pdf.static.guide.distance) { |
| 10942 | - e2pdf.static.drag.page.find('.e2pdf-guide-h').css("top", guides.top.guide.top / e2pdf.zoom.zoom - e2pdf.static.drag.page.offset().top / e2pdf.zoom.zoom - 1).show(); | |
| 11115 | + e2pdf.static.drag.page.find('.e2pdf-guide-h').css("top", guides.top.guide.top / e2pdf.zoom.scale - e2pdf.static.drag.page.offset().top / e2pdf.zoom.scale - 1).show(); | |
| 10943 | 11116 | var snap_top = guides.top.guide.top - guides.top.offset - jQuery(this).offset().top; |
| 10944 | 11117 | ui.position.top = snap_top; |
| 10945 | 11118 | } else { |
| 10946 | 11119 | jQuery('.e2pdf-guide-h').hide(); |
| @@ -10945,9 +11118,9 @@ | ||
| 10945 | 11118 | } else { |
| 10946 | 11119 | jQuery('.e2pdf-guide-h').hide(); |
| 10947 | 11120 | } |
| 10948 | 11121 | if (guides.left.dist <= e2pdf.static.guide.distance) { |
| 10949 | - e2pdf.static.drag.page.find('.e2pdf-guide-v').css("left", guides.left.guide.left / e2pdf.zoom.zoom - e2pdf.static.drag.page.offset().left / e2pdf.zoom.zoom - 1).show(); | |
| 11122 | + e2pdf.static.drag.page.find('.e2pdf-guide-v').css("left", guides.left.guide.left / e2pdf.zoom.scale - e2pdf.static.drag.page.offset().left / e2pdf.zoom.scale - 1).show(); | |
| 10950 | 11123 | var snap_left = guides.left.guide.left - guides.left.offset - jQuery(this).offset().left; |
| 10951 | 11124 | ui.position.left = snap_left; |
| 10952 | 11125 | } else { |
| 10953 | 11126 | jQuery('.e2pdf-guide-v').hide(); |
