summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2016-03-15 18:00:20 -0300
committerVitor Sousa <vitorsousasilva@gmail.com>2016-03-18 17:47:09 -0300
commit1422e62f302f2f2f0995b19f98d6f971e39a921f (patch)
tree13e7fbed6a0e5f4fde878907bc74645d241c8be6
parentc7550b2964e8f1c1cd9f51c7db573c5361f8cb10 (diff)
efl js: Fix naming of manual binding functions.
Also removed references to the discarded manual binding "ecore_js_file".
-rw-r--r--src/Makefile_Ecore_Js.am3
-rw-r--r--src/bindings/js/ecore_js/Ecore_Js.hh2
-rw-r--r--src/bindings/js/ecore_js/ecore_js_animator.cc48
-rw-r--r--src/bindings/js/ecore_js/ecore_js_event.cc51
-rw-r--r--src/bindings/js/ecore_js/ecore_js_idle.cc12
-rw-r--r--src/bindings/js/ecore_js/ecore_js_init.cc16
-rw-r--r--src/bindings/js/ecore_js/ecore_js_job.cc2
-rw-r--r--src/bindings/js/ecore_js/ecore_js_mainloop.cc20
-rw-r--r--src/bindings/js/ecore_js/ecore_js_poller.cc12
-rw-r--r--src/bindings/js/ecore_js/ecore_js_throttle.cc4
-rw-r--r--src/bindings/js/ecore_js/ecore_js_timer.cc10
-rw-r--r--src/bindings/js/efl_js/efl_js.cc6
-rw-r--r--src/bindings/js/eio_js/Eio_Js.hh2
-rw-r--r--src/bindings/js/eio_js/eio_js.cc181
-rw-r--r--src/bindings/js/ethumb_js/Ethumb_Js.hh1
-rw-r--r--src/bindings/js/ethumb_js/ethumb_js_client.cc29
-rwxr-xr-xsrc/tests/efl_js/benchmark_js_suite.js2
-rwxr-xr-xsrc/tests/efl_js/ecore_js_suite.js202
-rwxr-xr-xsrc/tests/efl_js/eina_js_containers_suite.js2
-rwxr-xr-xsrc/tests/efl_js/eina_js_suite.js2
-rwxr-xr-xsrc/tests/efl_js/eio_js_suite.js4
-rwxr-xr-xsrc/tests/efl_js/eldbus_js_suite.js2
-rwxr-xr-xsrc/tests/efl_js/ethumb_js_suite.js10
-rwxr-xr-xsrc/tests/eolian_js/eolian_js_suite.js2
24 files changed, 304 insertions, 321 deletions
diff --git a/src/Makefile_Ecore_Js.am b/src/Makefile_Ecore_Js.am
index df5ac2f..0c73b99 100644
--- a/src/Makefile_Ecore_Js.am
+++ b/src/Makefile_Ecore_Js.am
@@ -13,7 +13,6 @@ bindings/js/ecore_js/ecore_js_job.hh \
13bindings/js/ecore_js/ecore_js_idle.hh \ 13bindings/js/ecore_js/ecore_js_idle.hh \
14bindings/js/ecore_js/ecore_js_animator.hh \ 14bindings/js/ecore_js/ecore_js_animator.hh \
15bindings/js/ecore_js/ecore_js_poller.hh \ 15bindings/js/ecore_js/ecore_js_poller.hh \
16bindings/js/ecore_js/ecore_js_throttle.hh \ 16bindings/js/ecore_js/ecore_js_throttle.hh
17bindings/js/ecore_js/ecore_js_file.hh
18endif 17endif
19 18
diff --git a/src/bindings/js/ecore_js/Ecore_Js.hh b/src/bindings/js/ecore_js/Ecore_Js.hh
index 3f877f3..15331aa 100644
--- a/src/bindings/js/ecore_js/Ecore_Js.hh
+++ b/src/bindings/js/ecore_js/Ecore_Js.hh
@@ -5,6 +5,7 @@
5#include <Ecore.hh> 5#include <Ecore.hh>
6#include <Ecore_File.h> 6#include <Ecore_File.h>
7#include <Eina_Js.hh> 7#include <Eina_Js.hh>
8#include <Eo_Js.hh>
8 9
9#ifdef EAPI 10#ifdef EAPI
10# undef EAPI 11# undef EAPI
@@ -43,7 +44,6 @@ using ::efl::eina::js::compatibility_set_pointer_internal_field;
43 44
44EAPI void register_ecore_animator(v8::Isolate *isolate,v8::Handle<v8::Object> exports); 45EAPI void register_ecore_animator(v8::Isolate *isolate,v8::Handle<v8::Object> exports);
45EAPI void register_ecore_event(v8::Isolate* isolate, v8::Handle<v8::Object> exports); 46EAPI void register_ecore_event(v8::Isolate* isolate, v8::Handle<v8::Object> exports);
46EAPI void register_ecore_file(v8::Isolate* isolate, v8::Handle<v8::Object> exports);
47EAPI void register_ecore_idle(v8::Isolate *isolate,v8::Handle<v8::Object> exports); 47EAPI void register_ecore_idle(v8::Isolate *isolate,v8::Handle<v8::Object> exports);
48EAPI void register_ecore_job(v8::Isolate *isolate,v8::Handle<v8::Object> exports); 48EAPI void register_ecore_job(v8::Isolate *isolate,v8::Handle<v8::Object> exports);
49EAPI void register_ecore_mainloop(v8::Isolate *isolate,v8::Handle<v8::Object> exports); 49EAPI void register_ecore_mainloop(v8::Isolate *isolate,v8::Handle<v8::Object> exports);
diff --git a/src/bindings/js/ecore_js/ecore_js_animator.cc b/src/bindings/js/ecore_js/ecore_js_animator.cc
index 849e4d7..322db17 100644
--- a/src/bindings/js/ecore_js/ecore_js_animator.cc
+++ b/src/bindings/js/ecore_js/ecore_js_animator.cc
@@ -526,83 +526,75 @@ void register_ecore_animator(v8::Isolate* isolate, v8::Handle<v8::Object> export
526{ 526{
527 register_pos_map_linear(isolate, exports, 527 register_pos_map_linear(isolate, exports,
528 compatibility_new<v8::String>(isolate, 528 compatibility_new<v8::String>(isolate,
529 "ECORE_POS_MAP_LINEAR")); 529 "POS_MAP_LINEAR"));
530 register_pos_map_accelerate(isolate, exports, 530 register_pos_map_accelerate(isolate, exports,
531 compatibility_new<v8::String>(isolate, 531 compatibility_new<v8::String>(isolate,
532 "ECORE_POS_MAP" 532 "POS_MAP"
533 "_ACCELERATE")); 533 "_ACCELERATE"));
534 register_pos_map_decelerate(isolate, exports, 534 register_pos_map_decelerate(isolate, exports,
535 compatibility_new<v8::String>(isolate, 535 compatibility_new<v8::String>(isolate,
536 "ECORE_POS_MAP" 536 "POS_MAP"
537 "_DECELERATE")); 537 "_DECELERATE"));
538 register_pos_map_sinusoidal(isolate, exports, 538 register_pos_map_sinusoidal(isolate, exports,
539 compatibility_new<v8::String>(isolate, 539 compatibility_new<v8::String>(isolate,
540 "ECORE_POS_MAP" 540 "POS_MAP"
541 "_SINUSOIDAL")); 541 "_SINUSOIDAL"));
542 register_pos_map_accelerate_factor(isolate, exports, 542 register_pos_map_accelerate_factor(isolate, exports,
543 compatibility_new<v8::String>(isolate, 543 compatibility_new<v8::String>(isolate,
544 "ECORE_POS_MAP" 544 "POS_MAP"
545 "_ACCELERATE" 545 "_ACCELERATE"
546 "_FACTOR")); 546 "_FACTOR"));
547 register_pos_map_decelerate_factor(isolate, exports, 547 register_pos_map_decelerate_factor(isolate, exports,
548 compatibility_new<v8::String>(isolate, 548 compatibility_new<v8::String>(isolate,
549 "ECORE_POS_MAP" 549 "POS_MAP"
550 "_DECELERATE" 550 "_DECELERATE"
551 "_FACTOR")); 551 "_FACTOR"));
552 register_pos_map_sinusoidal_factor(isolate, exports, 552 register_pos_map_sinusoidal_factor(isolate, exports,
553 compatibility_new<v8::String>(isolate, 553 compatibility_new<v8::String>(isolate,
554 "ECORE_POS_MAP" 554 "POS_MAP"
555 "_SINUSOIDAL" 555 "_SINUSOIDAL"
556 "_FACTOR")); 556 "_FACTOR"));
557 register_pos_map_divisor_interp(isolate, exports, 557 register_pos_map_divisor_interp(isolate, exports,
558 compatibility_new<v8::String>(isolate, 558 compatibility_new<v8::String>(isolate,
559 "ECORE_POS_MAP" 559 "POS_MAP"
560 "_DIVISOR_INTERP")); 560 "_DIVISOR_INTERP"));
561 register_pos_map_bounce(isolate, exports, 561 register_pos_map_bounce(isolate, exports,
562 compatibility_new<v8::String>(isolate, 562 compatibility_new<v8::String>(isolate,
563 "ECORE_POS_MAP_BOUNCE")); 563 "POS_MAP_BOUNCE"));
564 register_pos_map_spring(isolate, exports, 564 register_pos_map_spring(isolate, exports,
565 compatibility_new<v8::String>(isolate, 565 compatibility_new<v8::String>(isolate,
566 "ECORE_POS_MAP_SPRING")); 566 "POS_MAP_SPRING"));
567 register_pos_map_cubic_bezier(isolate, exports, 567 register_pos_map_cubic_bezier(isolate, exports,
568 compatibility_new<v8::String>(isolate, 568 compatibility_new<v8::String>(isolate,
569 "ECORE_POS_MAP_CUBIC" 569 "POS_MAP_CUBIC"
570 "_BEZIER")); 570 "_BEZIER"));
571 register_animator_source_timer(isolate, exports, 571 register_animator_source_timer(isolate, exports,
572 compatibility_new<v8::String>(isolate, 572 compatibility_new<v8::String>(isolate,
573 "ECORE_ANIMATOR" 573 "SOURCE_TIMER"));
574 "_SOURCE_TIMER"));
575 register_animator_frametime_set(isolate, exports, 574 register_animator_frametime_set(isolate, exports,
576 compatibility_new<v8::String>(isolate, 575 compatibility_new<v8::String>(isolate,
577 "ecore_animator" 576 "setFrametime"));
578 "_frametime_set"));
579 register_animator_frametime_get(isolate, exports, 577 register_animator_frametime_get(isolate, exports,
580 compatibility_new<v8::String>(isolate, 578 compatibility_new<v8::String>(isolate,
581 "ecore_animator" 579 "getFrametime"));
582 "_frametime_get"));
583 register_animator_pos_map(isolate, exports, 580 register_animator_pos_map(isolate, exports,
584 compatibility_new<v8::String>(isolate, 581 compatibility_new<v8::String>(isolate,
585 "ecore_animator_pos" 582 "posMap"));
586 "_map"));
587 register_animator_pos_map_n(isolate, exports, 583 register_animator_pos_map_n(isolate, exports,
588 compatibility_new<v8::String>(isolate, 584 compatibility_new<v8::String>(isolate,
589 "ecore_animator_pos_map" 585 "posMapN"));
590 "_n"));
591 register_animator_source_set(isolate, exports, 586 register_animator_source_set(isolate, exports,
592 compatibility_new<v8::String>(isolate, 587 compatibility_new<v8::String>(isolate,
593 "ecore_animator_source" 588 "setSource"));
594 "_set"));
595 register_animator_source_get(isolate, exports, 589 register_animator_source_get(isolate, exports,
596 compatibility_new<v8::String>(isolate, 590 compatibility_new<v8::String>(isolate,
597 "ecore_animator_source" 591 "getSource"));
598 "_get"));
599 register_animator_add(isolate, exports, 592 register_animator_add(isolate, exports,
600 compatibility_new<v8::String>(isolate, 593 compatibility_new<v8::String>(isolate,
601 "ecore_animator_add")); 594 "add"));
602 register_animator_timeline_add(isolate, exports, 595 register_animator_timeline_add(isolate, exports,
603 compatibility_new<v8::String>(isolate, 596 compatibility_new<v8::String>(isolate,
604 "ecore_animator" 597 "addTimeline"));
605 "_timeline_add"));
606} 598}
607 599
608} } } // namespace efl { namespace js { 600} } } // namespace efl { namespace js {
diff --git a/src/bindings/js/ecore_js/ecore_js_event.cc b/src/bindings/js/ecore_js/ecore_js_event.cc
index a086d98..dbfa10c 100644
--- a/src/bindings/js/ecore_js/ecore_js_event.cc
+++ b/src/bindings/js/ecore_js/ecore_js_event.cc
@@ -690,83 +690,80 @@ void register_ecore_event(v8::Isolate* isolate, v8::Handle<v8::Object> exports)
690{ 690{
691 register_event_none(isolate, exports, 691 register_event_none(isolate, exports,
692 compatibility_new<v8::String>(isolate, 692 compatibility_new<v8::String>(isolate,
693 "ECORE_EVENT_NONE")); 693 "NONE"));
694 register_event_signal_user(isolate, exports, 694 register_event_signal_user(isolate, exports,
695 compatibility_new<v8::String> 695 compatibility_new<v8::String>
696 (isolate, "ECORE_EVENT_SIGNAL_USER")); 696 (isolate, "SIGNAL_USER"));
697 register_event_signal_hup(isolate, exports, 697 register_event_signal_hup(isolate, exports,
698 compatibility_new<v8::String> 698 compatibility_new<v8::String>
699 (isolate, "ECORE_EVENT_SIGNAL_HUP")); 699 (isolate, "SIGNAL_HUP"));
700 register_event_signal_exit(isolate, exports, 700 register_event_signal_exit(isolate, exports,
701 compatibility_new<v8::String> 701 compatibility_new<v8::String>
702 (isolate, "ECORE_EVENT_SIGNAL_EXIT")); 702 (isolate, "SIGNAL_EXIT"));
703 register_event_signal_power(isolate, exports, 703 register_event_signal_power(isolate, exports,
704 compatibility_new<v8::String> 704 compatibility_new<v8::String>
705 (isolate, "ECORE_EVENT_SIGNAL_POWER")); 705 (isolate, "SIGNAL_POWER"));
706 register_event_signal_realtime(isolate, exports, 706 register_event_signal_realtime(isolate, exports,
707 compatibility_new<v8::String> 707 compatibility_new<v8::String>
708 (isolate, "ECORE_EVENT_SIGNAL_REALTIME")); 708 (isolate, "SIGNAL_REALTIME"));
709 register_event_memory_state(isolate, exports, 709 register_event_memory_state(isolate, exports,
710 compatibility_new<v8::String> 710 compatibility_new<v8::String>
711 (isolate, "ECORE_EVENT_MEMORY_STATE")); 711 (isolate, "MEMORY_STATE"));
712 register_event_power_state(isolate, exports, 712 register_event_power_state(isolate, exports,
713 compatibility_new<v8::String> 713 compatibility_new<v8::String>
714 (isolate, "ECORE_EVENT_POWER_STATE")); 714 (isolate, "POWER_STATE"));
715 register_event_locale_changed(isolate, exports, 715 register_event_locale_changed(isolate, exports,
716 compatibility_new<v8::String> 716 compatibility_new<v8::String>
717 (isolate, "ECORE_EVENT_LOCALE_CHANGED")); 717 (isolate, "LOCALE_CHANGED"));
718 register_event_hostname_changed(isolate, exports, 718 register_event_hostname_changed(isolate, exports,
719 compatibility_new<v8::String> 719 compatibility_new<v8::String>
720 (isolate, "ECORE_EVENT_HOSTNAME_CHANGED")); 720 (isolate, "HOSTNAME_CHANGED"));
721 register_event_system_timedate_changed(isolate, exports, 721 register_event_system_timedate_changed(isolate, exports,
722 compatibility_new<v8::String> 722 compatibility_new<v8::String>
723 (isolate, 723 (isolate,
724 "ECORE_EVENT_SYSTEM_TIMEDATE" 724 "SYSTEM_TIMEDATE"
725 "_CHANGED")); 725 "_CHANGED"));
726 register_event_type_new(isolate, exports, 726 register_event_type_new(isolate, exports,
727 compatibility_new<v8::String>(isolate, 727 compatibility_new<v8::String>(isolate,
728 "ecore_event_type_new")); 728 "newType"));
729 register_event_add(isolate, exports, 729 register_event_add(isolate, exports,
730 compatibility_new<v8::String>(isolate, "ecore_event_add")); 730 compatibility_new<v8::String>(isolate, "add"));
731 register_event_handler_add(isolate, exports, 731 register_event_handler_add(isolate, exports,
732 compatibility_new<v8::String> 732 compatibility_new<v8::String>
733 (isolate, "ecore_event_handler_add")); 733 (isolate, "addHandler"));
734 register_event_filter_add(isolate, exports, 734 register_event_filter_add(isolate, exports,
735 compatibility_new<v8::String> 735 compatibility_new<v8::String>
736 (isolate, "ecore_event_filter_add")); 736 (isolate, "addFilter"));
737 register_event_current_type_get(isolate, exports, 737 register_event_current_type_get(isolate, exports,
738 compatibility_new<v8::String> 738 compatibility_new<v8::String>
739 (isolate, "ecore_event_current_type_get")); 739 (isolate, "getCurrentType"));
740 register_memory_state_normal(isolate, exports, 740 register_memory_state_normal(isolate, exports,
741 compatibility_new<v8::String> 741 compatibility_new<v8::String>
742 (isolate, "ECORE_MEMORY_STATE_NORMAL")); 742 (isolate, "MEMORY_STATE_NORMAL"));
743 register_memory_state_low(isolate, exports, 743 register_memory_state_low(isolate, exports,
744 compatibility_new<v8::String> 744 compatibility_new<v8::String>
745 (isolate, "ECORE_MEMORY_STATE_LOW")); 745 (isolate, "MEMORY_STATE_LOW"));
746 register_power_state_mains(isolate, exports, 746 register_power_state_mains(isolate, exports,
747 compatibility_new<v8::String> 747 compatibility_new<v8::String>
748 (isolate, "ECORE_POWER_STATE_MAINS")); 748 (isolate, "POWER_STATE_MAINS"));
749 register_power_state_battery(isolate, exports, 749 register_power_state_battery(isolate, exports,
750 compatibility_new<v8::String> 750 compatibility_new<v8::String>
751 (isolate, "ECORE_POWER_STATE_BATTERY")); 751 (isolate, "POWER_STATE_BATTERY"));
752 register_power_state_low(isolate, exports, 752 register_power_state_low(isolate, exports,
753 compatibility_new<v8::String>(isolate, 753 compatibility_new<v8::String>(isolate,
754 "ECORE_POWER_STATE_LOW")); 754 "POWER_STATE_LOW"));
755 register_event_signal_user_handler_add(isolate, exports, 755 register_event_signal_user_handler_add(isolate, exports,
756 compatibility_new<v8::String> 756 compatibility_new<v8::String>
757 (isolate, 757 (isolate,
758 "ecore_event_signal_user_handler" 758 "addSignalUserHandler"));
759 "_add"));
760 register_event_signal_exit_handler_add(isolate, exports, 759 register_event_signal_exit_handler_add(isolate, exports,
761 compatibility_new<v8::String> 760 compatibility_new<v8::String>
762 (isolate, 761 (isolate,
763 "ecore_event_signal_exit_handler" 762 "addSignalExitHandler"));
764 "_add"));
765 register_event_signal_realtime_handler_add(isolate, exports, 763 register_event_signal_realtime_handler_add(isolate, exports,
766 compatibility_new<v8::String> 764 compatibility_new<v8::String>
767 (isolate, 765 (isolate,
768 "ecore_event_signal_realtime" 766 "addSignalRealtimeHandler"));
769 "_handler_add"));
770} 767}
771 768
772} } } // namespace efl { namespace js { 769} } } // namespace efl { namespace js {
diff --git a/src/bindings/js/ecore_js/ecore_js_idle.cc b/src/bindings/js/ecore_js/ecore_js_idle.cc
index 293cef2..9bad24b 100644
--- a/src/bindings/js/ecore_js/ecore_js_idle.cc
+++ b/src/bindings/js/ecore_js/ecore_js_idle.cc
@@ -276,19 +276,17 @@ EAPI
276void register_ecore_idle(v8::Isolate *isolate,v8::Handle<v8::Object> exports) 276void register_ecore_idle(v8::Isolate *isolate,v8::Handle<v8::Object> exports)
277{ 277{
278 register_idler_add(isolate, exports, 278 register_idler_add(isolate, exports,
279 compatibility_new<v8::String>(isolate, "ecore_idler_add")); 279 compatibility_new<v8::String>(isolate, "add"));
280 register_idle_enterer_add(isolate, exports, 280 register_idle_enterer_add(isolate, exports,
281 compatibility_new<v8::String>(isolate, 281 compatibility_new<v8::String>(isolate,
282 "ecore_idle_enterer" 282 "addEnterer"));
283 "_add"));
284 register_idle_enterer_before_add(isolate, exports, 283 register_idle_enterer_before_add(isolate, exports,
285 compatibility_new<v8::String>(isolate, 284 compatibility_new<v8::String>(isolate,
286 "ecore_idle" 285 "addEnterer"
287 "_enterer_before" 286 "Before"));
288 "_add"));
289 register_idle_exiter_add(isolate, exports, 287 register_idle_exiter_add(isolate, exports,
290 compatibility_new<v8::String>(isolate, 288 compatibility_new<v8::String>(isolate,
291 "ecore_idle_exiter_add")); 289 "addExiter"));
292} 290}
293 291
294} } } // namespace efl { namespace js { 292} } } // namespace efl { namespace js {
diff --git a/src/bindings/js/ecore_js/ecore_js_init.cc b/src/bindings/js/ecore_js/ecore_js_init.cc
index ba2b04f..9f1c8cb 100644
--- a/src/bindings/js/ecore_js/ecore_js_init.cc
+++ b/src/bindings/js/ecore_js/ecore_js_init.cc
@@ -63,14 +63,14 @@ void register_ecore(v8::Isolate *isolate,v8::Handle<v8::Object> exports)
63 efl::ecore::js::register_shutdown(isolate, exports, 63 efl::ecore::js::register_shutdown(isolate, exports,
64 efl::eina::js::compatibility_new<v8::String> 64 efl::eina::js::compatibility_new<v8::String>
65 (isolate, "ecore_shutdown")); 65 (isolate, "ecore_shutdown"));
66 register_ecore_animator(isolate, exports); 66 register_ecore_animator(isolate, efl::eo::js::get_namespace({"Ecore", "Animator"}, isolate, exports));
67 register_ecore_event(isolate, exports); 67 register_ecore_event(isolate, efl::eo::js::get_namespace({"Ecore", "Event"}, isolate, exports));
68 register_ecore_idle(isolate, exports); 68 register_ecore_idle(isolate, efl::eo::js::get_namespace({"Ecore", "Idle"}, isolate, exports));
69 register_ecore_job(isolate, exports); 69 register_ecore_job(isolate, efl::eo::js::get_namespace({"Ecore", "Job"}, isolate, exports));
70 register_ecore_mainloop(isolate, exports); 70 register_ecore_mainloop(isolate, efl::eo::js::get_namespace({"Ecore", "Mainloop"}, isolate, exports));
71 register_ecore_poller(isolate, exports); 71 register_ecore_poller(isolate, efl::eo::js::get_namespace({"Ecore", "Poller"}, isolate, exports));
72 register_ecore_throttle(isolate, exports); 72 register_ecore_throttle(isolate, efl::eo::js::get_namespace({"Ecore", "Throttle"}, isolate, exports));
73 register_ecore_timer(isolate, exports); 73 register_ecore_timer(isolate, efl::eo::js::get_namespace({"Ecore", "Timer"}, isolate, exports));
74} 74}
75 75
76} } } // namespace efl { namespace js { 76} } } // namespace efl { namespace js {
diff --git a/src/bindings/js/ecore_js/ecore_js_job.cc b/src/bindings/js/ecore_js/ecore_js_job.cc
index 4ec438a..6e5f076 100644
--- a/src/bindings/js/ecore_js/ecore_js_job.cc
+++ b/src/bindings/js/ecore_js/ecore_js_job.cc
@@ -77,7 +77,7 @@ EAPI
77void register_ecore_job(v8::Isolate *isolate,v8::Handle<v8::Object> exports) 77void register_ecore_job(v8::Isolate *isolate,v8::Handle<v8::Object> exports)
78{ 78{
79 register_job_add(isolate, exports, 79 register_job_add(isolate, exports,
80 compatibility_new<v8::String>(isolate, "ecore_job_add")); 80 compatibility_new<v8::String>(isolate, "add"));
81} 81}
82 82
83} } } // namespace efl { namespace js { 83} } } // namespace efl { namespace js {
diff --git a/src/bindings/js/ecore_js/ecore_js_mainloop.cc b/src/bindings/js/ecore_js/ecore_js_mainloop.cc
index 180b35f..bc00c8f 100644
--- a/src/bindings/js/ecore_js/ecore_js_mainloop.cc
+++ b/src/bindings/js/ecore_js/ecore_js_mainloop.cc
@@ -172,36 +172,36 @@ void register_ecore_mainloop(v8::Isolate *isolate,v8::Handle<v8::Object> exports
172{ 172{
173 register_callback_cancel(isolate, exports, 173 register_callback_cancel(isolate, exports,
174 compatibility_new<v8::String> 174 compatibility_new<v8::String>
175 (isolate, "ECORE_CALLBACK_CANCEL")); 175 (isolate, "CALLBACK_CANCEL"));
176 register_callback_renew(isolate, exports, 176 register_callback_renew(isolate, exports,
177 compatibility_new<v8::String> 177 compatibility_new<v8::String>
178 (isolate, "ECORE_CALLBACK_RENEW")); 178 (isolate, "CALLBACK_RENEW"));
179 register_callback_pass_on(isolate, exports, 179 register_callback_pass_on(isolate, exports,
180 compatibility_new<v8::String> 180 compatibility_new<v8::String>
181 (isolate, "ECORE_CALLBACK_PASS_ON")); 181 (isolate, "CALLBACK_PASS_ON"));
182 register_callback_done(isolate, exports, 182 register_callback_done(isolate, exports,
183 compatibility_new<v8::String> 183 compatibility_new<v8::String>
184 (isolate, "ECORE_CALLBACK_DONE")); 184 (isolate, "CALLBACK_DONE"));
185 register_mainloop_iterate(isolate, exports, 185 register_mainloop_iterate(isolate, exports,
186 compatibility_new<v8::String> 186 compatibility_new<v8::String>
187 (isolate, "ecore_mainloop_iterate")); 187 (isolate, "iterate"));
188 register_mainloop_iterate_may_block(isolate, exports, 188 register_mainloop_iterate_may_block(isolate, exports,
189 compatibility_new<v8::String> 189 compatibility_new<v8::String>
190 (isolate, 190 (isolate,
191 "ecore_mainloop_iterate_may_block")); 191 "iterateMayBlock"));
192 register_mainloop_begin(isolate, exports, 192 register_mainloop_begin(isolate, exports,
193 compatibility_new<v8::String> 193 compatibility_new<v8::String>
194 (isolate, "ecore_mainloop_begin")); 194 (isolate, "begin"));
195 register_mainloop_quit(isolate, exports, 195 register_mainloop_quit(isolate, exports,
196 compatibility_new<v8::String> 196 compatibility_new<v8::String>
197 (isolate, "ecore_mainloop_quit")); 197 (isolate, "quit"));
198 register_mainloop_animator_ticked_get(isolate, exports, 198 register_mainloop_animator_ticked_get(isolate, exports,
199 compatibility_new<v8::String> 199 compatibility_new<v8::String>
200 (isolate, 200 (isolate,
201 "ecore_mainlop_animator_ticked_get")); 201 "getAnimatorTicked"));
202 register_mainloop_nested_get(isolate, exports, 202 register_mainloop_nested_get(isolate, exports,
203 compatibility_new<v8::String> 203 compatibility_new<v8::String>
204 (isolate, "ecore_mainloop_nested_get")); 204 (isolate, "getNested"));
205} 205}
206 206
207} } } // namespace efl { namespace js { 207} } } // namespace efl { namespace js {
diff --git a/src/bindings/js/ecore_js/ecore_js_poller.cc b/src/bindings/js/ecore_js/ecore_js_poller.cc
index e3bfbc8..3a49464 100644
--- a/src/bindings/js/ecore_js/ecore_js_poller.cc
+++ b/src/bindings/js/ecore_js/ecore_js_poller.cc
@@ -172,19 +172,15 @@ EAPI
172void register_ecore_poller(v8::Isolate *isolate,v8::Handle<v8::Object> exports) 172void register_ecore_poller(v8::Isolate *isolate,v8::Handle<v8::Object> exports)
173{ 173{
174 register_poller_core(isolate, exports, 174 register_poller_core(isolate, exports,
175 compatibility_new<v8::String>(isolate, "ECORE_POLLER_CORE")); 175 compatibility_new<v8::String>(isolate, "CORE"));
176 register_poller_poll_interval_set(isolate, exports, 176 register_poller_poll_interval_set(isolate, exports,
177 compatibility_new<v8::String>(isolate, 177 compatibility_new<v8::String>(isolate,
178 "ecore_poller" 178 "setPollInterval"));
179 "_poll_interval"
180 "_set"));
181 register_poller_poll_interval_get(isolate, exports, 179 register_poller_poll_interval_get(isolate, exports,
182 compatibility_new<v8::String>(isolate, 180 compatibility_new<v8::String>(isolate,
183 "ecore_poller" 181 "getPollInterval"));
184 "_poll_interval"
185 "_get"));
186 register_poller_add(isolate, exports, 182 register_poller_add(isolate, exports,
187 compatibility_new<v8::String>(isolate, "ecore_poller_add")); 183 compatibility_new<v8::String>(isolate, "add"));
188} 184}
189 185
190} } } // namespace efl { namespace js { 186} } } // namespace efl { namespace js {
diff --git a/src/bindings/js/ecore_js/ecore_js_throttle.cc b/src/bindings/js/ecore_js/ecore_js_throttle.cc
index 830a40f..9b184e5 100644
--- a/src/bindings/js/ecore_js/ecore_js_throttle.cc
+++ b/src/bindings/js/ecore_js/ecore_js_throttle.cc
@@ -54,10 +54,10 @@ void register_ecore_throttle(v8::Isolate *isolate,v8::Handle<v8::Object> exports
54{ 54{
55 register_throttle_adjust(isolate, exports, 55 register_throttle_adjust(isolate, exports,
56 compatibility_new<v8::String>(isolate, 56 compatibility_new<v8::String>(isolate,
57 "ecore_throttle_adjust")); 57 "adjust"));
58 register_throttle_get(isolate, exports, 58 register_throttle_get(isolate, exports,
59 compatibility_new<v8::String>(isolate, 59 compatibility_new<v8::String>(isolate,
60 "ecore_throttle_get")); 60 "get"));
61} 61}
62 62
63} } } // namespace efl { namespace js { 63} } } // namespace efl { namespace js {
diff --git a/src/bindings/js/ecore_js/ecore_js_timer.cc b/src/bindings/js/ecore_js/ecore_js_timer.cc
index f22100c..08c52d8 100644
--- a/src/bindings/js/ecore_js/ecore_js_timer.cc
+++ b/src/bindings/js/ecore_js/ecore_js_timer.cc
@@ -216,17 +216,15 @@ void register_ecore_timer(v8::Isolate *isolate,v8::Handle<v8::Object> exports)
216{ 216{
217 register_timer_precision_get(isolate, exports, 217 register_timer_precision_get(isolate, exports,
218 compatibility_new<v8::String>(isolate, 218 compatibility_new<v8::String>(isolate,
219 "ecore_timer_precision" 219 "getPrecision"));
220 "_get"));
221 register_timer_precision_set(isolate, exports, 220 register_timer_precision_set(isolate, exports,
222 compatibility_new<v8::String>(isolate, 221 compatibility_new<v8::String>(isolate,
223 "ecore_timer_precision" 222 "setPrecision"));
224 "_set"));
225 register_timer_add(isolate, exports, 223 register_timer_add(isolate, exports,
226 compatibility_new<v8::String>(isolate, "ecore_timer_add")); 224 compatibility_new<v8::String>(isolate, "add"));
227 register_timer_loop_add(isolate, exports, 225 register_timer_loop_add(isolate, exports,
228 compatibility_new<v8::String>(isolate, 226 compatibility_new<v8::String>(isolate,
229 "ecore_timer_loop_add")); 227 "addLoop"));
230} 228}
231 229
232} } } // namespace efl { namespace ecore { namespace js { 230} } } // namespace efl { namespace ecore { namespace js {
diff --git a/src/bindings/js/efl_js/efl_js.cc b/src/bindings/js/efl_js/efl_js.cc
index 227766d..b2f8e32 100644
--- a/src/bindings/js/efl_js/efl_js.cc
+++ b/src/bindings/js/efl_js/efl_js.cc
@@ -40,6 +40,7 @@ EAPI void eina_value_register(v8::Handle<v8::Object>, v8::Isolate* isolate);
40EAPI void register_ecore_mainloop(v8::Handle<v8::Object> global, v8::Isolate* isolate); 40EAPI void register_ecore_mainloop(v8::Handle<v8::Object> global, v8::Isolate* isolate);
41 41
42namespace ecore { 42namespace ecore {
43EAPI void register_animator(v8::Handle<v8::Object> global, v8::Isolate* isolate);
43EAPI void register_exe(v8::Handle<v8::Object> global, v8::Isolate* isolate); 44EAPI void register_exe(v8::Handle<v8::Object> global, v8::Isolate* isolate);
44EAPI void register_idler(v8::Handle<v8::Object> global, v8::Isolate* isolate); 45EAPI void register_idler(v8::Handle<v8::Object> global, v8::Isolate* isolate);
45EAPI void register_ecore(v8::Isolate* isolate, v8::Handle<v8::Object> exports); 46EAPI void register_ecore(v8::Isolate* isolate, v8::Handle<v8::Object> exports);
@@ -154,10 +155,10 @@ EAPI void init(v8::Handle<v8::Object> exports)
154 eina_log_register(exports, v8::Isolate::GetCurrent()); 155 eina_log_register(exports, v8::Isolate::GetCurrent());
155 eina_value_register(exports, v8::Isolate::GetCurrent()); 156 eina_value_register(exports, v8::Isolate::GetCurrent());
156 register_ecore_mainloop(exports, v8::Isolate::GetCurrent()); 157 register_ecore_mainloop(exports, v8::Isolate::GetCurrent());
157 efl::ecore::js::register_ecore(v8::Isolate::GetCurrent(), exports);
158 efl::eio::js::register_eio(v8::Isolate::GetCurrent(), exports); 158 efl::eio::js::register_eio(v8::Isolate::GetCurrent(), exports);
159 efl::eldbus::js::register_eldbus(v8::Isolate::GetCurrent(), exports); 159 efl::eldbus::js::register_eldbus(v8::Isolate::GetCurrent(), exports);
160 efl::ethumb::js::register_ethumb(v8::Isolate::GetCurrent(), exports); 160 efl::ethumb::js::register_ethumb(v8::Isolate::GetCurrent(), exports);
161 ecore::register_animator(exports, v8::Isolate::GetCurrent());
161 ecore::register_exe(exports, v8::Isolate::GetCurrent()); 162 ecore::register_exe(exports, v8::Isolate::GetCurrent());
162 ecore::register_idler(exports, v8::Isolate::GetCurrent()); 163 ecore::register_idler(exports, v8::Isolate::GetCurrent());
163 ecore::idle::register_enterer(exports, v8::Isolate::GetCurrent()); 164 ecore::idle::register_enterer(exports, v8::Isolate::GetCurrent());
@@ -180,6 +181,9 @@ EAPI void init(v8::Handle<v8::Object> exports)
180 register_ecore_audio_out_pulse(exports, v8::Isolate::GetCurrent()); 181 register_ecore_audio_out_pulse(exports, v8::Isolate::GetCurrent());
181 register_ecore_audio_out_sndfile(exports, v8::Isolate::GetCurrent()); 182 register_ecore_audio_out_sndfile(exports, v8::Isolate::GetCurrent());
182#endif 183#endif
184 // Manual ecore binding initialized last to allow extension of namespace
185 // created by eolian.
186 efl::ecore::js::register_ecore(v8::Isolate::GetCurrent(), exports);
183 efl::register_control(exports, v8::Isolate::GetCurrent()); 187 efl::register_control(exports, v8::Isolate::GetCurrent());
184 efl::register_file(exports, v8::Isolate::GetCurrent()); 188 efl::register_file(exports, v8::Isolate::GetCurrent());
185 efl::register_image(exports, v8::Isolate::GetCurrent()); 189 efl::register_image(exports, v8::Isolate::GetCurrent());
diff --git a/src/bindings/js/eio_js/Eio_Js.hh b/src/bindings/js/eio_js/Eio_Js.hh
index e379229..dce7db2 100644
--- a/src/bindings/js/eio_js/Eio_Js.hh
+++ b/src/bindings/js/eio_js/Eio_Js.hh
@@ -5,7 +5,7 @@
5#include <Ecore.h> 5#include <Ecore.h>
6 6
7#include <Eina.hh> 7#include <Eina.hh>
8 8#include <Eo_Js.hh>
9#include <Eina_Js.hh> 9#include <Eina_Js.hh>
10 10
11#ifdef EAPI 11#ifdef EAPI
diff --git a/src/bindings/js/eio_js/eio_js.cc b/src/bindings/js/eio_js/eio_js.cc
index 8441247..7fafe8b 100644
--- a/src/bindings/js/eio_js/eio_js.cc
+++ b/src/bindings/js/eio_js/eio_js.cc
@@ -167,7 +167,7 @@ static v8::Local<v8::Object> wrap_monitor(Eio_Monitor *monitor,
167 167
168 ret->Set(compatibility_new<String>(isolate, "del"), 168 ret->Set(compatibility_new<String>(isolate, "del"),
169 compatibility_new<FunctionTemplate>(isolate, del)->GetFunction()); 169 compatibility_new<FunctionTemplate>(isolate, del)->GetFunction());
170 ret->Set(compatibility_new<String>(isolate, "path_get"), 170 ret->Set(compatibility_new<String>(isolate, "getPath"),
171 compatibility_new<FunctionTemplate>(isolate, path_get) 171 compatibility_new<FunctionTemplate>(isolate, path_get)
172 ->GetFunction()); 172 ->GetFunction());
173 173
@@ -226,11 +226,11 @@ v8::Local<v8::Object> wrap_eina_file_direct_info(const Eina_File_Direct_Info*
226 226
227 auto wrapped_info = compatibility_new<Object>(isolate); 227 auto wrapped_info = compatibility_new<Object>(isolate);
228 228
229 wrapped_info->Set(compatibility_new<String>(isolate, "path_length"), 229 wrapped_info->Set(compatibility_new<String>(isolate, "pathLength"),
230 compatibility_new<Integer>(isolate, info->path_length)); 230 compatibility_new<Integer>(isolate, info->path_length));
231 wrapped_info->Set(compatibility_new<String>(isolate, "mame_length"), 231 wrapped_info->Set(compatibility_new<String>(isolate, "nameLength"),
232 compatibility_new<Integer>(isolate, info->name_length)); 232 compatibility_new<Integer>(isolate, info->name_length));
233 wrapped_info->Set(compatibility_new<String>(isolate, "name_start"), 233 wrapped_info->Set(compatibility_new<String>(isolate, "nameStart"),
234 compatibility_new<Integer>(isolate, info->name_start)); 234 compatibility_new<Integer>(isolate, info->name_start));
235 wrapped_info->Set(compatibility_new<String>(isolate, "type"), 235 wrapped_info->Set(compatibility_new<String>(isolate, "type"),
236 compatibility_new<Integer>(isolate, info->type)); 236 compatibility_new<Integer>(isolate, info->type));
@@ -1623,134 +1623,135 @@ EAPI
1623void register_eio(v8::Isolate* isolate, v8::Handle<v8::Object> exports) 1623void register_eio(v8::Isolate* isolate, v8::Handle<v8::Object> exports)
1624{ 1624{
1625 using v8::String; 1625 using v8::String;
1626 register_init(isolate, exports, 1626 auto eioNamespace = efl::eo::js::get_namespace({"Eio"}, isolate, exports);
1627 compatibility_new<String>(isolate, "eio_init")); 1627 register_init(isolate, eioNamespace,
1628 register_shutdown(isolate, exports, 1628 compatibility_new<String>(isolate, "init"));
1629 compatibility_new<String>(isolate, "eio_shutdown")); 1629 register_shutdown(isolate, eioNamespace,
1630 register_op_file_copy(isolate, exports, 1630 compatibility_new<String>(isolate, "shutdown"));
1631 compatibility_new<String>(isolate, "EIO_FILE_COPY")); 1631 register_op_file_copy(isolate, eioNamespace,
1632 register_op_file_move(isolate, exports, 1632 compatibility_new<String>(isolate, "FILE_COPY"));
1633 compatibility_new<String>(isolate, "EIO_FILE_MOVE")); 1633 register_op_file_move(isolate, eioNamespace,
1634 register_op_dir_copy(isolate, exports, 1634 compatibility_new<String>(isolate, "FILE_MOVE"));
1635 compatibility_new<String>(isolate, "EIO_DIR_COPY")); 1635 register_op_dir_copy(isolate, eioNamespace,
1636 register_op_dir_move(isolate, exports, 1636 compatibility_new<String>(isolate, "DIR_COPY"));
1637 compatibility_new<String>(isolate, "EIO_DIR_MOVE")); 1637 register_op_dir_move(isolate, eioNamespace,
1638 register_op_unlink(isolate, exports, 1638 compatibility_new<String>(isolate, "DIR_MOVE"));
1639 compatibility_new<String>(isolate, "EIO_LINK")); 1639 register_op_unlink(isolate, eioNamespace,
1640 register_op_file_getpwnam(isolate, exports, 1640 compatibility_new<String>(isolate, "UNLINK"));
1641 register_op_file_getpwnam(isolate, eioNamespace,
1641 compatibility_new<String>(isolate, 1642 compatibility_new<String>(isolate,
1642 "EIO_FILE_GETPWNAM")); 1643 "FILE_GETPWNAM"));
1643 register_op_file_getgrnam(isolate, exports, 1644 register_op_file_getgrnam(isolate, eioNamespace,
1644 compatibility_new<String>(isolate, 1645 compatibility_new<String>(isolate,
1645 "EIO_FILE_GETGRNAM")); 1646 "FILE_GETGRNAM"));
1646 register_file_open(isolate, exports, 1647 register_file_open(isolate, eioNamespace,
1647 compatibility_new<String>(isolate, "eio_file_open")); 1648 compatibility_new<String>(isolate, "openFile"));
1648 register_monitor_file_created(isolate, exports, 1649 register_monitor_file_created(isolate, eioNamespace,
1649 compatibility_new<String>(isolate, 1650 compatibility_new<String>(isolate,
1650 "EIO_MONITOR_FILE" 1651 "MONITOR_FILE"
1651 "_CREATED")); 1652 "_CREATED"));
1652 register_monitor_file_deleted(isolate, exports, 1653 register_monitor_file_deleted(isolate, eioNamespace,
1653 compatibility_new<String>(isolate, 1654 compatibility_new<String>(isolate,
1654 "EIO_MONITOR_FILE" 1655 "MONITOR_FILE"
1655 "_DELETED")); 1656 "_DELETED"));
1656 register_monitor_file_modified(isolate, exports, 1657 register_monitor_file_modified(isolate, eioNamespace,
1657 compatibility_new<String>(isolate, 1658 compatibility_new<String>(isolate,
1658 "EIO_MONITOR_FILE" 1659 "MONITOR_FILE"
1659 "_MODIFIED")); 1660 "_MODIFIED"));
1660 register_monitor_file_closed(isolate, exports, 1661 register_monitor_file_closed(isolate, eioNamespace,
1661 compatibility_new<String>(isolate, 1662 compatibility_new<String>(isolate,
1662 "EIO_MONITOR_FILE" 1663 "MONITOR_FILE"
1663 "_CLOSED")); 1664 "_CLOSED"));
1664 register_monitor_directory_created(isolate, exports, 1665 register_monitor_directory_created(isolate, eioNamespace,
1665 compatibility_new<String> 1666 compatibility_new<String>
1666 (isolate, 1667 (isolate,
1667 "EIO_MONITOR_DIRECTORY_CREATED")); 1668 "MONITOR_DIRECTORY_CREATED"));
1668 register_monitor_directory_deleted(isolate, exports, 1669 register_monitor_directory_deleted(isolate, eioNamespace,
1669 compatibility_new<String> 1670 compatibility_new<String>
1670 (isolate, 1671 (isolate,
1671 "EIO_MONITOR_DIRECTORY_DELETED")); 1672 "MONITOR_DIRECTORY_DELETED"));
1672 register_monitor_directory_modified(isolate, exports, 1673 register_monitor_directory_modified(isolate, eioNamespace,
1673 compatibility_new<String> 1674 compatibility_new<String>
1674 (isolate, 1675 (isolate,
1675 "EIO_MONITOR_DIRECTORY_MODIFIED")); 1676 "MONITOR_DIRECTORY_MODIFIED"));
1676 register_monitor_directory_closed(isolate, exports, 1677 register_monitor_directory_closed(isolate, eioNamespace,
1677 compatibility_new<String> 1678 compatibility_new<String>
1678 (isolate, "EIO_MONITOR_DIRECTORY_CLOSED")); 1679 (isolate, "MONITOR_DIRECTORY_CLOSED"));
1679 register_monitor_self_rename(isolate, exports, 1680 register_monitor_self_rename(isolate, eioNamespace,
1680 compatibility_new<String> 1681 compatibility_new<String>
1681 (isolate, "EIO_MONITOR_SELF_RENAME")); 1682 (isolate, "MONITOR_SELF_RENAME"));
1682 register_monitor_self_deleted(isolate, exports, 1683 register_monitor_self_deleted(isolate, eioNamespace,
1683 compatibility_new<String> 1684 compatibility_new<String>
1684 (isolate, "EIO_MONITOR_SELF_DELETED")); 1685 (isolate, "MONITOR_SELF_DELETED"));
1685 register_monitor_error(isolate, exports, 1686 register_monitor_error(isolate, eioNamespace,
1686 compatibility_new<String>(isolate, 1687 compatibility_new<String>(isolate,
1687 "EIO_MONITOR_ERROR")); 1688 "MONITOR_ERROR"));
1688 register_monitor_add(isolate, exports, 1689 register_monitor_add(isolate, eioNamespace,
1689 compatibility_new<String>(isolate, "eio_monitor_add")); 1690 compatibility_new<String>(isolate, "addMonitor"));
1690 register_event_monitor_file_created_handler_add 1691 register_event_monitor_file_created_handler_add
1691 (isolate, exports, 1692 (isolate, eioNamespace,
1692 compatibility_new<String>(isolate, 1693 compatibility_new<String>(isolate,
1693 "eio_event_monitor_file_created_handler_add")); 1694 "addEventMonitorFileCreatedHandler"));
1694 register_event_monitor_file_deleted_handler_add 1695 register_event_monitor_file_deleted_handler_add
1695 (isolate, exports, 1696 (isolate, eioNamespace,
1696 compatibility_new<String>(isolate, 1697 compatibility_new<String>(isolate,
1697 "eio_event_monitor_file_deleted_handler_add")); 1698 "addEventMonitorFileDeletedHandler"));
1698 register_event_monitor_file_modified_handler_add 1699 register_event_monitor_file_modified_handler_add
1699 (isolate, exports, 1700 (isolate, eioNamespace,
1700 compatibility_new<String> 1701 compatibility_new<String>
1701 (isolate, "eio_event_monitor_file_modified_handler_add")); 1702 (isolate, "addEventMonitorFileModifiedHandler"));
1702 register_event_monitor_file_closed_handler_add 1703 register_event_monitor_file_closed_handler_add
1703 (isolate, exports, 1704 (isolate, eioNamespace,
1704 compatibility_new<String>(isolate, 1705 compatibility_new<String>(isolate,
1705 "eio_event_monitor_file_closed_handler_add")); 1706 "addEventMonitorFileClosedHandler"));
1706 register_event_monitor_directory_created_handler_add 1707 register_event_monitor_directory_created_handler_add
1707 (isolate, exports, 1708 (isolate, eioNamespace,
1708 compatibility_new<String> 1709 compatibility_new<String>
1709 (isolate, "eio_event_monitor_directory_created_handler_add")); 1710 (isolate, "addEventMonitorDirectoryCreatedHandler"));
1710 register_event_monitor_directory_deleted_handler_add 1711 register_event_monitor_directory_deleted_handler_add
1711 (isolate, exports, 1712 (isolate, eioNamespace,
1712 compatibility_new<String> 1713 compatibility_new<String>
1713 (isolate, "eio_event_monitor_directory_deleted_handler_add")); 1714 (isolate, "addEventMonitorDirectoryDeletedHandler"));
1714 register_event_monitor_directory_modified_handler_add 1715 register_event_monitor_directory_modified_handler_add
1715 (isolate, exports, 1716 (isolate, eioNamespace,
1716 compatibility_new<String> 1717 compatibility_new<String>
1717 (isolate, "eio_event_monitor_directory_modified_handler_add")); 1718 (isolate, "addEventMonitorDirectoryModifiedHandler"));
1718 register_event_monitor_directory_closed_handler_add 1719 register_event_monitor_directory_closed_handler_add
1719 (isolate, exports, 1720 (isolate, eioNamespace,
1720 compatibility_new<String> 1721 compatibility_new<String>
1721 (isolate, "eio_event_monitor_directory_closed_handler_add")); 1722 (isolate, "addEventMonitorDirectoryClosedHandler"));
1722 register_event_monitor_self_rename_handler_add 1723 register_event_monitor_self_rename_handler_add
1723 (isolate, exports, 1724 (isolate, eioNamespace,
1724 compatibility_new<String>(isolate, 1725 compatibility_new<String>(isolate,
1725 "eio_event_monitor_self_rename_handler_add")); 1726 "addEventMonitorSelfRenameHandler"));
1726 register_event_monitor_self_deleted_handler_add 1727 register_event_monitor_self_deleted_handler_add
1727 (isolate, exports, 1728 (isolate, eioNamespace,
1728 compatibility_new<String>(isolate, 1729 compatibility_new<String>(isolate,
1729 "eio_event_monitor_self_deleted_handler_add")); 1730 "addEventMonitorSelfDeletedHandler"));
1730 register_event_monitor_error_handler_add 1731 register_event_monitor_error_handler_add
1731 (isolate, exports, 1732 (isolate, eioNamespace,
1732 compatibility_new<String>(isolate, 1733 compatibility_new<String>(isolate,
1733 "eio_event_monitor_error_handler_add")); 1734 "addEventMonitorErrorHandler"));
1734 register_file_ls(isolate, exports, 1735 register_file_ls(isolate, eioNamespace,
1735 compatibility_new<String>(isolate, "eio_file_ls")); 1736 compatibility_new<String>(isolate, "lsFile"));
1736 register_file_chmod(isolate, exports, 1737 register_file_chmod(isolate, eioNamespace,
1737 compatibility_new<String>(isolate, "eio_file_chmod")); 1738 compatibility_new<String>(isolate, "chmodFile"));
1738 register_file_chown(isolate, exports, 1739 register_file_chown(isolate, eioNamespace,
1739 compatibility_new<String>(isolate, "eio_file_chown")); 1740 compatibility_new<String>(isolate, "chownFile"));
1740 register_file_unlink(isolate, exports, 1741 register_file_unlink(isolate, eioNamespace,
1741 compatibility_new<String>(isolate, "eio_file_unlink")); 1742 compatibility_new<String>(isolate, "unlinkFile"));
1742 register_file_mkdir(isolate, exports, 1743 register_file_mkdir(isolate, eioNamespace,
1743 compatibility_new<String>(isolate, "eio_file_mkdir")); 1744 compatibility_new<String>(isolate, "mkdirFile"));
1744 register_file_move(isolate, exports, 1745 register_file_move(isolate, eioNamespace,
1745 compatibility_new<String>(isolate, "eio_file_move")); 1746 compatibility_new<String>(isolate, "moveFile"));
1746 register_file_copy(isolate, exports, 1747 register_file_copy(isolate, eioNamespace,
1747 compatibility_new<String>(isolate, "eio_file_copy")); 1748 compatibility_new<String>(isolate, "copyFile"));
1748 register_dir_move(isolate, exports, 1749 register_dir_move(isolate, eioNamespace,
1749 compatibility_new<String>(isolate, "eio_dir_move")); 1750 compatibility_new<String>(isolate, "moveDir"));
1750 register_dir_copy(isolate, exports, 1751 register_dir_copy(isolate, eioNamespace,
1751 compatibility_new<String>(isolate, "eio_dir_copy")); 1752 compatibility_new<String>(isolate, "copyDir"));
1752 register_dir_unlink(isolate, exports, 1753 register_dir_unlink(isolate, eioNamespace,
1753 compatibility_new<String>(isolate, "eio_dir_unlink")); 1754 compatibility_new<String>(isolate, "unlinkDir"));
1754} 1755}
1755 1756
1756} } } // namespace efl { namespace eio { namespace js { 1757} } } // namespace efl { namespace eio { namespace js {
diff --git a/src/bindings/js/ethumb_js/Ethumb_Js.hh b/src/bindings/js/ethumb_js/Ethumb_Js.hh
index 3945970..b45b555 100644
--- a/src/bindings/js/ethumb_js/Ethumb_Js.hh
+++ b/src/bindings/js/ethumb_js/Ethumb_Js.hh
@@ -5,6 +5,7 @@
5 5
6#include <Eina_Js.hh> 6#include <Eina_Js.hh>
7#include <Ethumb_Client.h> 7#include <Ethumb_Client.h>
8#include <Eo_Js.hh>
8 9
9#ifdef EAPI 10#ifdef EAPI
10# undef EAPI 11# undef EAPI
diff --git a/src/bindings/js/ethumb_js/ethumb_js_client.cc b/src/bindings/js/ethumb_js/ethumb_js_client.cc
index 50aaee3..541538b 100644
--- a/src/bindings/js/ethumb_js/ethumb_js_client.cc
+++ b/src/bindings/js/ethumb_js/ethumb_js_client.cc
@@ -417,32 +417,32 @@ v8::Local<v8::Object> wrap_ethumb_client(Ethumb_Client *client,
417 ret->Set(compatibility_new<String>(isolate, "disconnect"), 417 ret->Set(compatibility_new<String>(isolate, "disconnect"),
418 compatibility_new<FunctionTemplate>(isolate, disconnect) 418 compatibility_new<FunctionTemplate>(isolate, disconnect)
419 ->GetFunction()); 419 ->GetFunction());
420 ret->Set(compatibility_new<String>(isolate, "on_server_die_callback_set"), 420 ret->Set(compatibility_new<String>(isolate, "setOnServerDieCallback"),
421 compatibility_new<FunctionTemplate>(isolate, 421 compatibility_new<FunctionTemplate>(isolate,
422 on_server_die_callback_set) 422 on_server_die_callback_set)
423 ->GetFunction()); 423 ->GetFunction());
424 ret->Set(compatibility_new<String>(isolate, "file_set"), 424 ret->Set(compatibility_new<String>(isolate, "setFile"),
425 compatibility_new<FunctionTemplate>(isolate, file_set) 425 compatibility_new<FunctionTemplate>(isolate, file_set)
426 ->GetFunction()); 426 ->GetFunction());
427 ret->Set(compatibility_new<String>(isolate, "file_get"), 427 ret->Set(compatibility_new<String>(isolate, "getFile"),
428 compatibility_new<FunctionTemplate>(isolate, file_get) 428 compatibility_new<FunctionTemplate>(isolate, file_get)
429 ->GetFunction()); 429 ->GetFunction());
430 ret->Set(compatibility_new<String>(isolate, "file_free"), 430 ret->Set(compatibility_new<String>(isolate, "freeFile"),
431 compatibility_new<FunctionTemplate>(isolate, file_free) 431 compatibility_new<FunctionTemplate>(isolate, file_free)
432 ->GetFunction()); 432 ->GetFunction());
433 ret->Set(compatibility_new<String>(isolate, "thumb_exists"), 433 ret->Set(compatibility_new<String>(isolate, "existsThumb"),
434 compatibility_new<FunctionTemplate>(isolate, thumb_exists) 434 compatibility_new<FunctionTemplate>(isolate, thumb_exists)
435 ->GetFunction()); 435 ->GetFunction());
436 ret->Set(compatibility_new<String>(isolate, "generate"), 436 ret->Set(compatibility_new<String>(isolate, "generate"),
437 compatibility_new<FunctionTemplate>(isolate, generate) 437 compatibility_new<FunctionTemplate>(isolate, generate)
438 ->GetFunction()); 438 ->GetFunction());
439 ret->Set(compatibility_new<String>(isolate, "generate_cancel"), 439 ret->Set(compatibility_new<String>(isolate, "cancelGenerate"),
440 compatibility_new<FunctionTemplate>(isolate, generate_cancel) 440 compatibility_new<FunctionTemplate>(isolate, generate_cancel)
441 ->GetFunction()); 441 ->GetFunction());
442 ret->Set(compatibility_new<String>(isolate, "generate_cancel_all"), 442 ret->Set(compatibility_new<String>(isolate, "cancelAllGenerate"),
443 compatibility_new<FunctionTemplate>(isolate, generate_cancel_all) 443 compatibility_new<FunctionTemplate>(isolate, generate_cancel_all)
444 ->GetFunction()); 444 ->GetFunction());
445 ret->Set(compatibility_new<String>(isolate, "thumb_async_get"), 445 ret->Set(compatibility_new<String>(isolate, "getThumbAsync"),
446 compatibility_new<FunctionTemplate>(isolate, thumb_async_get) 446 compatibility_new<FunctionTemplate>(isolate, thumb_async_get)
447 ->GetFunction()); 447 ->GetFunction());
448 448
@@ -557,15 +557,16 @@ EAPI
557void register_ethumb(v8::Isolate *isolate, v8::Handle<v8::Object> exports) 557void register_ethumb(v8::Isolate *isolate, v8::Handle<v8::Object> exports)
558{ 558{
559 using v8::String; 559 using v8::String;
560 register_client_init(isolate, exports, 560 auto ethumbNamespace = efl::eo::js::get_namespace({"Ethumb"}, isolate, exports);
561 register_client_init(isolate, ethumbNamespace,
561 compatibility_new<String>(isolate, 562 compatibility_new<String>(isolate,
562 "ethumb_client_init")); 563 "initClient"));
563 register_client_shutdown(isolate, exports, 564 register_client_shutdown(isolate, ethumbNamespace,
564 compatibility_new<String>(isolate, 565 compatibility_new<String>(isolate,
565 "ethumb_client_shutdown")); 566 "shutdownClient"));
566 register_client_connect(isolate, exports, 567 register_client_connect(isolate, ethumbNamespace,
567 compatibility_new<String>(isolate, 568 compatibility_new<String>(isolate,
568 "ethumb_client_connect")); 569 "connectClient"));
569} 570}
570 571
571} } } // namespace efl { namespace ethumb { namespace js { 572} } } // namespace efl { namespace ethumb { namespace js {
diff --git a/src/tests/efl_js/benchmark_js_suite.js b/src/tests/efl_js/benchmark_js_suite.js
index b3a5d7c..fc1de01 100755
--- a/src/tests/efl_js/benchmark_js_suite.js
+++ b/src/tests/efl_js/benchmark_js_suite.js
@@ -26,7 +26,7 @@ if(typeof process !== 'undefined')
26 if (process.argv.indexOf("--verbose") != -1) 26 if (process.argv.indexOf("--verbose") != -1)
27 console.info.apply(null, arguments); 27 console.info.apply(null, arguments);
28 }; 28 };
29 exit = efl.ecore_mainloop_quit; 29 exit = efl.Ecore.Mainloop.quit;
30} 30}
31else 31else
32{ 32{
diff --git a/src/tests/efl_js/ecore_js_suite.js b/src/tests/efl_js/ecore_js_suite.js
index 8534304..85630af 100755
--- a/src/tests/efl_js/ecore_js_suite.js
+++ b/src/tests/efl_js/ecore_js_suite.js
@@ -12,7 +12,6 @@ if(typeof process !== 'undefined')
12{ 12{
13 console.log('running from nodejs'); 13 console.log('running from nodejs');
14 console.log('path', process.env.NODE_PATH); 14 console.log('path', process.env.NODE_PATH);
15 console.log("teste1");
16 15
17 efl = require('efl'); 16 efl = require('efl');
18 assert(efl != null, "could not load efl node module"); 17 assert(efl != null, "could not load efl node module");
@@ -27,7 +26,7 @@ if(typeof process !== 'undefined')
27 if (process.argv.indexOf("--verbose") != -1) 26 if (process.argv.indexOf("--verbose") != -1)
28 console.info.apply(null, arguments); 27 console.info.apply(null, arguments);
29 }; 28 };
30 exit = efl.ecore_mainloop_quit; 29 exit = efl.Ecore.Mainloop.quit;
31} 30}
32else 31else
33{ 32{
@@ -73,51 +72,50 @@ function abs(n) {
73var TOLERANCE = 0.0001; 72var TOLERANCE = 0.0001;
74// end ecore preamble 73// end ecore preamble
75 74
76start_test("timers", function () { 75start_test("ecore timers", function () {
77 var p = 2.5; 76 var p = 2.5;
78 efl.ecore_timer_precision_set(p); 77 efl.Ecore.Timer.setPrecision(p);
79 assert(abs(efl.ecore_timer_precision_get() - p) < TOLERANCE); 78 assert(abs(efl.Ecore.Timer.getPrecision() - p) < TOLERANCE);
80 79
81 p = 0.5; 80 p = 0.5;
82 efl.ecore_timer_precision_set(p); 81 efl.Ecore.Timer.setPrecision(p);
83 assert(abs(efl.ecore_timer_precision_get() - p) < TOLERANCE); 82 assert(abs(efl.Ecore.Timer.getPrecision() - p) < TOLERANCE);
84 83
85 var ncalls = 0; 84 var ncalls = 0;
86 85
87 captured = false; 86 captured = false;
88 efl.ecore_timer_add(1, function() { 87 efl.Ecore.Timer.add(1, function() {
89 print_info('ecore_timer_add handler');
90 ++ncalls; 88 ++ncalls;
91 if (ncalls != 4) 89 if (ncalls != 4)
92 return true; 90 return true;
93 91
94 captured = true; 92 captured = true;
95 efl.ecore_job_add(efl.ecore_mainloop_quit); 93 efl.Ecore.Job.add(efl.Ecore.Mainloop.quit);
96 return false; 94 return false;
97 }); 95 });
98 96
99 efl.ecore_mainloop_begin(); 97 efl.Ecore.Mainloop.begin();
100 assert(captured); 98 assert(captured);
101 99
102 ncalls = 0; 100 ncalls = 0;
103 captured = false; 101 captured = false;
104 102
105 efl.ecore_timer_loop_add(1, function() { 103 efl.Ecore.Timer.addLoop(1, function() {
106 ++ncalls; 104 ++ncalls;
107 if (ncalls != 4) 105 if (ncalls != 4)
108 return true; 106 return true;
109 107
110 captured = true; 108 captured = true;
111 efl.ecore_job_add(efl.ecore_mainloop_quit); 109 efl.Ecore.Job.add(efl.Ecore.Mainloop.quit);
112 return false; 110 return false;
113 }); 111 });
114 112
115 efl.ecore_mainloop_begin(); 113 efl.Ecore.Mainloop.begin();
116 assert(captured); 114 assert(captured);
117 115
118 captured = false; 116 captured = false;
119 117
120 var timer = efl.ecore_timer_add(1, function() { 118 var timer = efl.Ecore.Timer.add(1, function() {
121 captured = true; 119 captured = true;
122 return false; 120 return false;
123 }); 121 });
@@ -134,65 +132,79 @@ start_test("timers", function () {
134 132
135 timer.del(); 133 timer.del();
136 134
137 efl.ecore_timer_add(2, function() { 135 efl.Ecore.Timer.add(2, function() {
138 efl.ecore_job_add(efl.ecore_mainloop_quit); 136 efl.Ecore.Job.add(efl.Ecore.Mainloop.quit);
139 return false; 137 return false;
140 }); 138 });
141 139
142 efl.ecore_mainloop_begin(); 140 efl.Ecore.Mainloop.begin();
143 assert(captured === false); 141 assert(captured === false);
144}); 142});
145 143
146// Ecore event 144// Ecore event
147start_test("ecore event", function () { 145start_test("ecore event", function () {
148 var myevent = efl.ecore_event_type_new(); 146 var myevent = efl.Ecore.Event.newType();
149 147
150 captured = [0, 0, 0] 148 captured = [0, 0, 0]
151 149
152 var handler1 = efl.ecore_event_handler_add(myevent, function(event) { 150 var handler1 = efl.Ecore.Event.addHandler(myevent, function(event) {
153 assert(efl.ecore_event_current_type_get() === myevent); 151 print_info("CALLBACK_PASS_ON pre assert");
152 assert(efl.Ecore.Event.getCurrentType() === myevent);
154 assert(event === myevent); 153 assert(event === myevent);
155 captured[0] += 1; 154 captured[0] += 1;
156 return efl.ECORE_CALLBACK_PASS_ON; 155 print_info("CALLBACK_PASS_ON post assert");
156 return efl.Ecore.Mainloop.CALLBACK_PASS_ON;
157 }); 157 });
158 158
159 var handler2 = efl.ecore_event_handler_add(myevent, function(event) { 159 var handler2 = efl.Ecore.Event.addHandler(myevent, function(event) {
160 assert(efl.ecore_event_current_type_get() === myevent); 160 print_info("CALLBACK_DONE #1 pre assert");
161 assert(efl.Ecore.Event.getCurrentType() === myevent);
161 assert(event === myevent); 162 assert(event === myevent);
162 captured[1] += 1; 163 captured[1] += 1;
163 return efl.ECORE_CALLBACK_DONE; 164 print_info("CALLBACK_DONE #1 post assert");
165 return efl.Ecore.Mainloop.CALLBACK_DONE;
164 }); 166 });
165 167
166 var handler3 = efl.ecore_event_handler_add(myevent, function(event) { 168 var handler3 = efl.Ecore.Event.addHandler(myevent, function(event) {
167 assert(efl.ecore_event_current_type_get() === myevent); 169 print_info("CALLBACK_DONE #2 pre assert");
170 assert(efl.Ecore.Event.getCurrentType() === myevent);
168 assert(event === myevent); 171 assert(event === myevent);
169 captured[2] += 1; 172 captured[2] += 1;
170 return efl.ECORE_CALLBACK_DONE; 173 print_info("CALLBACK_DONE #2 post assert");
174 return efl.Ecore.Mainloop.CALLBACK_DONE;
171 }); 175 });
172 176
173 efl.ecore_timer_add(1, function() { 177 efl.Ecore.Timer.add(1, function() {
174 efl.ecore_event_add(myevent); 178 efl.Ecore.Event.add(myevent);
179 print_info("Timer.add(1, callback) before assert");
175 assert(captured[0] === 0 && captured[1] === 0 && captured[2] === 0); 180 assert(captured[0] === 0 && captured[1] === 0 && captured[2] === 0);
176 efl.ecore_timer_add(1, function() { 181 print_info("Timer.add(1, callback) after assert");
182 efl.Ecore.Timer.add(1, function() {
183 print_info("inner Timer.add(1, callback) before assert");
177 assert(captured[0] === 1 && captured[1] === 1 && captured[2] === 0); 184 assert(captured[0] === 1 && captured[1] === 1 && captured[2] === 0);
185 print_info("inner Timer.add(1, callback) after assert");
178 handler1.del(); 186 handler1.del();
179 efl.ecore_event_add(myevent); 187 efl.Ecore.Event.add(myevent);
180 efl.ecore_event_add(myevent); 188 efl.Ecore.Event.add(myevent);
181 efl.ecore_event_add(myevent).del(); 189 efl.Ecore.Event.add(myevent).del();
182 efl.ecore_timer_add(1, function() { 190 efl.Ecore.Timer.add(1, function() {
191 print_info("twice inner Timer.add(1, callback) before assert");
183 assert(captured[0] === 1 && captured[1] === 3 && captured[2] === 0); 192 assert(captured[0] === 1 && captured[1] === 3 && captured[2] === 0);
184 efl.ecore_mainloop_quit(); 193 print_info("twice inner Timer.add(1, callback) after assert");
194 efl.Ecore.Mainloop.quit();
185 }); 195 });
186 }); 196 });
187 }); 197 });
188 198
189 efl.ecore_mainloop_begin(); 199 efl.Ecore.Mainloop.begin();
190 200
191 efl.ecore_event_add(myevent); 201 efl.Ecore.Event.add(myevent);
192 efl.ecore_event_add(myevent); 202 efl.Ecore.Event.add(myevent);
193 efl.ecore_event_add(myevent); 203 efl.Ecore.Event.add(myevent);
194 204
195 var filter = efl.ecore_event_filter_add(function() { 205 print_info("will add filter");
206
207 var filter = efl.Ecore.Event.addFilter(function() {
196 return {count: 0}; 208 return {count: 0};
197 }, function(loop_data, event) { 209 }, function(loop_data, event) {
198 assert(event === myevent); 210 assert(event === myevent);
@@ -201,17 +213,17 @@ start_test("ecore event", function () {
201 return c != 0; 213 return c != 0;
202 }, function(loop_data) {}); 214 }, function(loop_data) {});
203 215
204 efl.ecore_timer_add(1, efl.ecore_mainloop_quit); 216 efl.Ecore.Timer.add(1, efl.Ecore.Mainloop.quit);
205 efl.ecore_mainloop_begin(); 217 efl.Ecore.Mainloop.begin();
206 assert(captured[1] === 5); 218 assert(captured[1] === 5);
207 filter.del(); 219 filter.del();
208 220
209 efl.ecore_event_add(myevent); 221 efl.Ecore.Event.add(myevent);
210 efl.ecore_event_add(myevent); 222 efl.Ecore.Event.add(myevent);
211 efl.ecore_event_add(myevent); 223 efl.Ecore.Event.add(myevent);
212 224
213 efl.ecore_timer_add(1, efl.ecore_mainloop_quit); 225 efl.Ecore.Timer.add(1, efl.Ecore.Mainloop.quit);
214 efl.ecore_mainloop_begin(); 226 efl.Ecore.Mainloop.begin();
215 assert(captured[1] === 8); 227 assert(captured[1] === 8);
216 228
217 handler2.del(); 229 handler2.del();
@@ -222,22 +234,22 @@ start_test("ecore event", function () {
222start_test("ecore jobs", function () { 234start_test("ecore jobs", function () {
223 captured = false; 235 captured = false;
224 236
225 efl.ecore_job_add(function() { 237 efl.Ecore.Job.add(function() {
226 captured = true; 238 captured = true;
227 efl.ecore_mainloop_quit(); 239 efl.Ecore.Mainloop.quit();
228 }); 240 });
229 241
230 assert(captured === false); 242 assert(captured === false);
231 efl.ecore_mainloop_begin(); 243 efl.Ecore.Mainloop.begin();
232 assert(captured === true); 244 assert(captured === true);
233 245
234 captured = false; 246 captured = false;
235 var job = efl.ecore_job_add(function() { 247 var job = efl.Ecore.Job.add(function() {
236 captured = true; 248 captured = true;
237 }); 249 });
238 efl.ecore_job_add(efl.ecore_mainloop_quit); 250 efl.Ecore.Job.add(efl.Ecore.Mainloop.quit);
239 job.del(); 251 job.del();
240 efl.ecore_mainloop_begin(); 252 efl.Ecore.Mainloop.begin();
241 assert(captured === false); 253 assert(captured === false);
242}); 254});
243 255
@@ -246,92 +258,76 @@ start_test("ecore idle", function () {
246 var counter = 1; 258 var counter = 1;
247 captured = [0, 0, 0, 0, 0]; 259 captured = [0, 0, 0, 0, 0];
248 260
249 efl.ecore_idler_add(function() { 261 efl.Ecore.Idle.add(function() {
250 print_info('ecore idle handler 1');
251 captured[0] = counter; 262 captured[0] = counter;
252 counter += 1; 263 counter += 1;
253 efl.ecore_job_add(function() { print_info('ecore job handler 1'); }); 264 efl.Ecore.Job.add(function() { print_info('ecore job handler 1'); });
254 return efl.ECORE_CALLBACK_DONE; 265 return efl.Ecore.Mainloop.CALLBACK_DONE;
255 }); 266 });
256 267
257 print_info('ecore idle 1'); 268 efl.Ecore.Idle.addEnterer(function() {
258
259 efl.ecore_idle_enterer_add(function() {
260 print_info('ecore idle handler 2');
261 captured[1] = counter; 269 captured[1] = counter;
262 counter += 1; 270 counter += 1;
263 return efl.ECORE_CALLBACK_DONE; 271 return efl.Ecore.Mainloop.CALLBACK_DONE;
264 }); 272 });
265 273
266 print_info('ecore idle 2'); 274 efl.Ecore.Idle.addEnterer(function() {
267
268 efl.ecore_idle_enterer_add(function() {
269 print_info('ecore idle handler 3');
270 captured[2] = counter; 275 captured[2] = counter;
271 counter += 1; 276 counter += 1;
272 return efl.ECORE_CALLBACK_DONE; 277 return efl.Ecore.Mainloop.CALLBACK_DONE;
273 }); 278 });
274 279
275 print_info('ecore idle 3'); 280 efl.Ecore.Idle.addEntererBefore(function() {
276
277 efl.ecore_idle_enterer_before_add(function() {
278 print_info('ecore idle handler 4');
279 captured[3] = counter; 281 captured[3] = counter;
280 counter += 1; 282 counter += 1;
281 return efl.ECORE_CALLBACK_DONE; 283 return efl.Ecore.Mainloop.CALLBACK_DONE;
282 }); 284 });
283 285
284 print_info('ecore idle 4'); 286 efl.Ecore.Idle.addExiter(function() {
285
286 efl.ecore_idle_exiter_add(function() {
287 print_info('ecore idle handler 5');
288 captured[4] = counter; 287 captured[4] = counter;
289 counter += 1; 288 counter += 1;
290 efl.ecore_mainloop_quit(); 289 efl.Ecore.Mainloop.quit();
291 return efl.ECORE_CALLBACK_DONE; 290 return efl.Ecore.Mainloop.CALLBACK_DONE;
292 }); 291 });
293 292
294 print_info('ecore idle 5'); 293 efl.Ecore.Mainloop.begin();
295
296 efl.ecore_mainloop_begin();
297
298 print_info('ecore idle 6');
299 294
300 assert(captured[0] === 4, "ecore_idler_add test"); 295 assert(captured[0] === 4, "Ecore.Idle.add test");
301 assert(captured[1] === 2, "ecore_idle_enterer_add test"); 296 assert(captured[1] === 2, "Ecore.Idle.addEnterer test");
302 assert(captured[2] === 3, "ecore_idle_enterer_add test two"); 297 assert(captured[2] === 3, "Ecore.Idle.addEnterer test two");
303 assert(captured[3] === 1, "ecore_idle_enterer_before_add test"); 298 assert(captured[3] === 1, "Ecore.Idle.addEntererBefore test");
304 assert(captured[4] === 5, "ecore_idle_exiter_add test"); 299 assert(captured[4] === 5, "Ecore.Idle.addExiter test");
305}); 300});
306 301
307// Ecore animator 302// Ecore animator
308start_test("ecore animator", function () { 303start_test("ecore animator", function () {
309 efl.ecore_animator_frametime_set(1); 304 efl.Ecore.Animator.setFrametime(1);
310 assert(efl.ecore_animator_frametime_get() === 1); 305 assert(efl.Ecore.Animator.getFrametime() === 1);
311 efl.ecore_animator_frametime_set(1 / 50); 306 efl.Ecore.Animator.setFrametime(1 / 50);
312 assert(efl.ecore_animator_frametime_get() === (1 / 50)); 307 assert(efl.Ecore.Animator.getFrametime() === (1 / 50));
313 308
314 assert(efl.ecore_animator_pos_map(0.5, efl.ECORE_POS_MAP_LINEAR, 0, 0) 309 assert(efl.Ecore.Animator.posMap(0.5, efl.Ecore.Animator.POS_MAP_LINEAR, 0, 0)
315 === 0.5); 310 === 0.5);
316 311
317 efl.ecore_animator_source_set(efl.ECORE_ANIMATOR_SOURCE_CUSTOM); 312 efl.Ecore.Animator.setSource(efl.Ecore.Animator.SOURCE_TIMER);
313 assert(efl.Ecore.Animator.getSource() === efl.Ecore.Animator.SOURCE_TIMER);
318}); 314});
319 315
320// Ecore poller 316// Ecore poller
321start_test("ecore poller", function () { 317start_test("ecore poller", function () {
322 efl.ecore_poller_poll_interval_set(efl.ECORE_POLLER_CORE, 42); 318 efl.Ecore.Poller.setPollInterval(efl.Ecore.Poller.CORE, 42);
323 assert(efl.ecore_poller_poll_interval_get(efl.ECORE_POLLER_CORE) === 42); 319 assert(efl.Ecore.Poller.getPollInterval(efl.Ecore.Poller.CORE) === 42);
324 efl.ecore_poller_poll_interval_set(efl.ECORE_POLLER_CORE, 2); 320 efl.Ecore.Poller.setPollInterval(efl.Ecore.Poller.CORE, 2);
325 assert(efl.ecore_poller_poll_interval_get(efl.ECORE_POLLER_CORE) === 2); 321 assert(efl.Ecore.Poller.getPollInterval(efl.Ecore.Poller.CORE) === 2);
326}); 322});
327 323
328start_test("ecore throttle", function () { 324start_test("ecore throttle", function () {
329 // Ecore throttle 325 // Ecore throttle
330 326
331 efl.ecore_throttle_adjust(3); 327 efl.Ecore.Throttle.adjust(3);
332 assert(efl.ecore_throttle_get() === 3); 328 assert(efl.Ecore.Throttle.get() === 3);
333 efl.ecore_throttle_adjust(-3); 329 efl.Ecore.Throttle.adjust(-3);
334 assert(efl.ecore_throttle_get() === 0); 330 assert(efl.Ecore.Throttle.get() === 0);
335}); 331});
336 332
337// footer 333// footer
diff --git a/src/tests/efl_js/eina_js_containers_suite.js b/src/tests/efl_js/eina_js_containers_suite.js
index f4f6bf3..4abb8af 100755
--- a/src/tests/efl_js/eina_js_containers_suite.js
+++ b/src/tests/efl_js/eina_js_containers_suite.js
@@ -27,7 +27,7 @@ if(typeof process !== 'undefined')
27 if (process.argv.indexOf("--verbose") != -1) 27 if (process.argv.indexOf("--verbose") != -1)
28 console.info.apply(null, arguments); 28 console.info.apply(null, arguments);
29 }; 29 };
30 exit = efl.ecore_mainloop_quit; 30 exit = efl.Ecore.Mainloop.quit;
31} 31}
32else 32else
33{ 33{
diff --git a/src/tests/efl_js/eina_js_suite.js b/src/tests/efl_js/eina_js_suite.js
index 811e1f6..95aabfb 100755
--- a/src/tests/efl_js/eina_js_suite.js
+++ b/src/tests/efl_js/eina_js_suite.js
@@ -27,7 +27,7 @@ if(typeof process !== 'undefined')
27 if (process.argv.indexOf("--verbose") != -1) 27 if (process.argv.indexOf("--verbose") != -1)
28 console.info.apply(null, arguments); 28 console.info.apply(null, arguments);
29 }; 29 };
30 exit = efl.ecore_mainloop_quit; 30 exit = efl.Ecore.Mainloop.quit;
31} 31}
32else 32else
33{ 33{
diff --git a/src/tests/efl_js/eio_js_suite.js b/src/tests/efl_js/eio_js_suite.js
index 01eb09c..bef83cf 100755
--- a/src/tests/efl_js/eio_js_suite.js
+++ b/src/tests/efl_js/eio_js_suite.js
@@ -27,7 +27,7 @@ if(typeof process !== 'undefined')
27 if (process.argv.indexOf("--verbose") != -1) 27 if (process.argv.indexOf("--verbose") != -1)
28 console.info.apply(null, arguments); 28 console.info.apply(null, arguments);
29 }; 29 };
30 exit = efl.ecore_mainloop_quit; 30 exit = efl.Ecore.Mainloop.quit;
31} 31}
32else 32else
33{ 33{
@@ -66,7 +66,7 @@ function start_test(test_name, test_func) {
66 66
67// Eio tests 67// Eio tests
68start_test('test constants', function () { 68start_test('test constants', function () {
69 assert(typeof(efl.EIO_FILE_COPY) === 'number'); 69 assert(typeof(efl.Eio.FILE_COPY) === 'number');
70}); 70});
71// TODO: more tests 71// TODO: more tests
72 72
diff --git a/src/tests/efl_js/eldbus_js_suite.js b/src/tests/efl_js/eldbus_js_suite.js
index 3086907..d57fbfe 100755
--- a/src/tests/efl_js/eldbus_js_suite.js
+++ b/src/tests/efl_js/eldbus_js_suite.js
@@ -27,7 +27,7 @@ if(typeof process !== 'undefined')
27 if (process.argv.indexOf("--verbose") != -1) 27 if (process.argv.indexOf("--verbose") != -1)
28 console.info.apply(null, arguments); 28 console.info.apply(null, arguments);
29 }; 29 };
30 exit = efl.ecore_mainloop_quit; 30 exit = efl.Ecore.Mainloop.quit;
31} 31}
32else 32else
33{ 33{
diff --git a/src/tests/efl_js/ethumb_js_suite.js b/src/tests/efl_js/ethumb_js_suite.js
index 5dd78fc..33bf33d 100755
--- a/src/tests/efl_js/ethumb_js_suite.js
+++ b/src/tests/efl_js/ethumb_js_suite.js
@@ -27,7 +27,7 @@ if(typeof process !== 'undefined')
27 if (process.argv.indexOf("--verbose") != -1) 27 if (process.argv.indexOf("--verbose") != -1)
28 console.info.apply(null, arguments); 28 console.info.apply(null, arguments);
29 }; 29 };
30 exit = efl.ecore_mainloop_quit; 30 exit = efl.Ecore.Mainloop.quit;
31} 31}
32else 32else
33{ 33{
@@ -47,7 +47,7 @@ suite_fail = []; // Will store the name of the failures
47 47
48// Basic test function // 48// Basic test function //
49function start_test(test_name, test_func) { 49function start_test(test_name, test_func) {
50 print("[ RUN ] ethumb_js_suite: " + test_name); 50 print("[ RUN ] Ethumb.js_suite: " + test_name);
51 var test_result = true; 51 var test_result = true;
52 try { 52 try {
53 test_func(); 53 test_func();
@@ -56,7 +56,7 @@ function start_test(test_name, test_func) {
56 test_result = false; 56 test_result = false;
57 print_error("Error: ", e, e.stack); 57 print_error("Error: ", e, e.stack);
58 } 58 }
59 print("[ " + (test_result ? "PASS" : "FAIL") + " ] ethumb_js_suite: " + test_name); 59 print("[ " + (test_result ? "PASS" : "FAIL") + " ] Ethumb.js_suite: " + test_name);
60 if (test_result) 60 if (test_result)
61 suite_ok += 1; 61 suite_ok += 1;
62 else 62 else
@@ -64,7 +64,7 @@ function start_test(test_name, test_func) {
64} 64}
65// end Preamble 65// end Preamble
66 66
67efl.ethumb_client_init(); 67efl.Ethumb.initClient();
68 68
69// Ethumb tests 69// Ethumb tests
70 70
@@ -72,7 +72,7 @@ start_test('dummy test', function () {
72 assert(true); 72 assert(true);
73}); 73});
74 74
75efl.ethumb_client_shutdown(); 75efl.Ethumb.shutdownClient();
76 76
77// footer 77// footer
78 78
diff --git a/src/tests/eolian_js/eolian_js_suite.js b/src/tests/eolian_js/eolian_js_suite.js
index 44c4b5a..9c66dba 100755
--- a/src/tests/eolian_js/eolian_js_suite.js
+++ b/src/tests/eolian_js/eolian_js_suite.js
@@ -27,7 +27,7 @@ if(typeof process !== 'undefined')
27 if (process.argv.indexOf("--verbose") != -1) 27 if (process.argv.indexOf("--verbose") != -1)
28 console.info.apply(null, arguments); 28 console.info.apply(null, arguments);
29 }; 29 };
30 exit = efl.ecore_mainloop_quit; 30 exit = efl.Ecore.Mainloop.quit;
31} 31}
32else 32else
33{ 33{