diff options
-rw-r--r-- | js/classes/ElggEntity.js (renamed from engine/js/classes/ElggEntity.js) | 0 | ||||
-rw-r--r-- | js/classes/ElggPriorityList.js (renamed from engine/js/classes/ElggPriorityList.js) | 0 | ||||
-rw-r--r-- | js/classes/ElggUser.js (renamed from engine/js/classes/ElggUser.js) | 0 | ||||
-rw-r--r-- | js/lib/ajax.js (renamed from engine/js/lib/ajax.js) | 0 | ||||
-rw-r--r-- | js/lib/configuration.js (renamed from engine/js/lib/configuration.js) | 0 | ||||
-rw-r--r-- | js/lib/elgglib.js (renamed from engine/js/lib/elgglib.js) | 0 | ||||
-rw-r--r-- | js/lib/events.js (renamed from engine/js/lib/events.js) | 0 | ||||
-rw-r--r-- | js/lib/languages.js (renamed from engine/js/lib/languages.js) | 0 | ||||
-rw-r--r-- | js/lib/security.js (renamed from engine/js/lib/security.js) | 0 | ||||
-rw-r--r-- | js/lib/session.js (renamed from engine/js/lib/session.js) | 0 | ||||
-rw-r--r-- | js/lib/ui.js (renamed from engine/js/lib/ui.js) | 0 | ||||
-rw-r--r-- | js/lib/ui.widgets.js (renamed from engine/js/lib/ui.widgets.js) | 0 | ||||
-rw-r--r-- | js/tests/ElggAjaxOptionsTest.js (renamed from engine/js/tests/ElggAjaxOptionsTest.js) | 0 | ||||
-rw-r--r-- | js/tests/ElggAjaxTest.js (renamed from engine/js/tests/ElggAjaxTest.js) | 0 | ||||
-rw-r--r-- | js/tests/ElggEventsTest.js (renamed from engine/js/tests/ElggEventsTest.js) | 0 | ||||
-rw-r--r-- | js/tests/ElggLanguagesTest.js (renamed from engine/js/tests/ElggLanguagesTest.js) | 0 | ||||
-rw-r--r-- | js/tests/ElggLibTest.js (renamed from engine/js/tests/ElggLibTest.js) | 0 | ||||
-rw-r--r-- | js/tests/ElggPriorityListTest.js (renamed from engine/js/tests/ElggPriorityListTest.js) | 0 | ||||
-rw-r--r-- | js/tests/ElggSecurityTest.js (renamed from engine/js/tests/ElggSecurityTest.js) | 0 | ||||
-rw-r--r-- | js/tests/ElggSessionTest.js (renamed from engine/js/tests/ElggSessionTest.js) | 0 | ||||
-rw-r--r-- | jsTestDriver.conf | 8 | ||||
-rw-r--r-- | views/default/js/initialise_elgg.php | 6 |
22 files changed, 7 insertions, 7 deletions
diff --git a/engine/js/classes/ElggEntity.js b/js/classes/ElggEntity.js index 9461a463f..9461a463f 100644 --- a/engine/js/classes/ElggEntity.js +++ b/js/classes/ElggEntity.js diff --git a/engine/js/classes/ElggPriorityList.js b/js/classes/ElggPriorityList.js index 521fbbb64..521fbbb64 100644 --- a/engine/js/classes/ElggPriorityList.js +++ b/js/classes/ElggPriorityList.js diff --git a/engine/js/classes/ElggUser.js b/js/classes/ElggUser.js index 8a7a8b7eb..8a7a8b7eb 100644 --- a/engine/js/classes/ElggUser.js +++ b/js/classes/ElggUser.js diff --git a/engine/js/lib/ajax.js b/js/lib/ajax.js index 184fd0da3..184fd0da3 100644 --- a/engine/js/lib/ajax.js +++ b/js/lib/ajax.js diff --git a/engine/js/lib/configuration.js b/js/lib/configuration.js index 8ed326116..8ed326116 100644 --- a/engine/js/lib/configuration.js +++ b/js/lib/configuration.js diff --git a/engine/js/lib/elgglib.js b/js/lib/elgglib.js index 32dbb1ec3..32dbb1ec3 100644 --- a/engine/js/lib/elgglib.js +++ b/js/lib/elgglib.js diff --git a/engine/js/lib/events.js b/js/lib/events.js index 358dd6280..358dd6280 100644 --- a/engine/js/lib/events.js +++ b/js/lib/events.js diff --git a/engine/js/lib/languages.js b/js/lib/languages.js index 3231cf77d..3231cf77d 100644 --- a/engine/js/lib/languages.js +++ b/js/lib/languages.js diff --git a/engine/js/lib/security.js b/js/lib/security.js index bdd762560..bdd762560 100644 --- a/engine/js/lib/security.js +++ b/js/lib/security.js diff --git a/engine/js/lib/session.js b/js/lib/session.js index 227c607eb..227c607eb 100644 --- a/engine/js/lib/session.js +++ b/js/lib/session.js diff --git a/engine/js/lib/ui.js b/js/lib/ui.js index 4a9c64e70..4a9c64e70 100644 --- a/engine/js/lib/ui.js +++ b/js/lib/ui.js diff --git a/engine/js/lib/ui.widgets.js b/js/lib/ui.widgets.js index 1e3163709..1e3163709 100644 --- a/engine/js/lib/ui.widgets.js +++ b/js/lib/ui.widgets.js diff --git a/engine/js/tests/ElggAjaxOptionsTest.js b/js/tests/ElggAjaxOptionsTest.js index 8a2b7f574..8a2b7f574 100644 --- a/engine/js/tests/ElggAjaxOptionsTest.js +++ b/js/tests/ElggAjaxOptionsTest.js diff --git a/engine/js/tests/ElggAjaxTest.js b/js/tests/ElggAjaxTest.js index 1fa5daca5..1fa5daca5 100644 --- a/engine/js/tests/ElggAjaxTest.js +++ b/js/tests/ElggAjaxTest.js diff --git a/engine/js/tests/ElggEventsTest.js b/js/tests/ElggEventsTest.js index cc30e8418..cc30e8418 100644 --- a/engine/js/tests/ElggEventsTest.js +++ b/js/tests/ElggEventsTest.js diff --git a/engine/js/tests/ElggLanguagesTest.js b/js/tests/ElggLanguagesTest.js index 950d5d3b8..950d5d3b8 100644 --- a/engine/js/tests/ElggLanguagesTest.js +++ b/js/tests/ElggLanguagesTest.js diff --git a/engine/js/tests/ElggLibTest.js b/js/tests/ElggLibTest.js index 035b60325..035b60325 100644 --- a/engine/js/tests/ElggLibTest.js +++ b/js/tests/ElggLibTest.js diff --git a/engine/js/tests/ElggPriorityListTest.js b/js/tests/ElggPriorityListTest.js index 2549e0ee0..2549e0ee0 100644 --- a/engine/js/tests/ElggPriorityListTest.js +++ b/js/tests/ElggPriorityListTest.js diff --git a/engine/js/tests/ElggSecurityTest.js b/js/tests/ElggSecurityTest.js index 4324f5671..4324f5671 100644 --- a/engine/js/tests/ElggSecurityTest.js +++ b/js/tests/ElggSecurityTest.js diff --git a/engine/js/tests/ElggSessionTest.js b/js/tests/ElggSessionTest.js index 0245e9e90..0245e9e90 100644 --- a/engine/js/tests/ElggSessionTest.js +++ b/js/tests/ElggSessionTest.js diff --git a/jsTestDriver.conf b/jsTestDriver.conf index fc1fe0b8b..2f732da7b 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -2,7 +2,7 @@ server: http://localhost:42442 load:
- vendors/jquery/jquery-1.4.2.min.js
- - engine/js/lib/elgglib.js
- - engine/js/classes/*.js
- - engine/js/lib/*.js
- - engine/js/tests/*.js
\ No newline at end of file + - js/lib/elgglib.js
+ - js/classes/*.js
+ - js/lib/*.js
+ - js/tests/*.js
\ No newline at end of file diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php index 98dfc28a7..0c6fb7e88 100644 --- a/views/default/js/initialise_elgg.php +++ b/views/default/js/initialise_elgg.php @@ -4,7 +4,7 @@ */ global $CONFIG; -include("{$CONFIG->path}engine/js/lib/elgglib.js"); +include("{$CONFIG->path}js/lib/elgglib.js"); //No such thing as autoloading classes in javascript $model_files = array( @@ -14,7 +14,7 @@ $model_files = array( ); foreach($model_files as $file) { - include("{$CONFIG->path}engine/js/classes/$file.js"); + include("{$CONFIG->path}js/classes/$file.js"); } //Include library files @@ -32,7 +32,7 @@ $libs = array( ); foreach($libs as $file) { - include("{$CONFIG->path}engine/js/lib/$file.js"); + include("{$CONFIG->path}js/lib/$file.js"); } /** |