Refs #2538: Moved js directory to elgg root.

git-svn-id: http://code.elgg.org/elgg/trunk@7189 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/js/classes/ElggEntity.js b/js/classes/ElggEntity.js
similarity index 100%
rename from engine/js/classes/ElggEntity.js
rename to js/classes/ElggEntity.js

diff --git a/engine/js/classes/ElggPriorityList.js b/js/classes/ElggPriorityList.js
similarity index 100%
rename from engine/js/classes/ElggPriorityList.js
rename to js/classes/ElggPriorityList.js

diff --git a/engine/js/classes/ElggUser.js b/js/classes/ElggUser.js
similarity index 100%
rename from engine/js/classes/ElggUser.js
rename to js/classes/ElggUser.js

diff --git a/engine/js/lib/ajax.js b/js/lib/ajax.js
similarity index 100%
rename from engine/js/lib/ajax.js
rename to js/lib/ajax.js

diff --git a/engine/js/lib/configuration.js b/js/lib/configuration.js
similarity index 100%
rename from engine/js/lib/configuration.js
rename to js/lib/configuration.js

diff --git a/engine/js/lib/elgglib.js b/js/lib/elgglib.js
similarity index 100%
rename from engine/js/lib/elgglib.js
rename to js/lib/elgglib.js

diff --git a/engine/js/lib/events.js b/js/lib/events.js
similarity index 100%
rename from engine/js/lib/events.js
rename to js/lib/events.js

diff --git a/engine/js/lib/languages.js b/js/lib/languages.js
similarity index 100%
rename from engine/js/lib/languages.js
rename to js/lib/languages.js

diff --git a/engine/js/lib/security.js b/js/lib/security.js
similarity index 100%
rename from engine/js/lib/security.js
rename to js/lib/security.js

diff --git a/engine/js/lib/session.js b/js/lib/session.js
similarity index 100%
rename from engine/js/lib/session.js
rename to js/lib/session.js

diff --git a/engine/js/lib/ui.js b/js/lib/ui.js
similarity index 100%
rename from engine/js/lib/ui.js
rename to js/lib/ui.js

diff --git a/engine/js/lib/ui.widgets.js b/js/lib/ui.widgets.js
similarity index 100%
rename from engine/js/lib/ui.widgets.js
rename to js/lib/ui.widgets.js

diff --git a/engine/js/tests/ElggAjaxOptionsTest.js b/js/tests/ElggAjaxOptionsTest.js
similarity index 100%
rename from engine/js/tests/ElggAjaxOptionsTest.js
rename to js/tests/ElggAjaxOptionsTest.js

diff --git a/engine/js/tests/ElggAjaxTest.js b/js/tests/ElggAjaxTest.js
similarity index 100%
rename from engine/js/tests/ElggAjaxTest.js
rename to js/tests/ElggAjaxTest.js

diff --git a/engine/js/tests/ElggEventsTest.js b/js/tests/ElggEventsTest.js
similarity index 100%
rename from engine/js/tests/ElggEventsTest.js
rename to js/tests/ElggEventsTest.js

diff --git a/engine/js/tests/ElggLanguagesTest.js b/js/tests/ElggLanguagesTest.js
similarity index 100%
rename from engine/js/tests/ElggLanguagesTest.js
rename to js/tests/ElggLanguagesTest.js

diff --git a/engine/js/tests/ElggLibTest.js b/js/tests/ElggLibTest.js
similarity index 100%
rename from engine/js/tests/ElggLibTest.js
rename to js/tests/ElggLibTest.js

diff --git a/engine/js/tests/ElggPriorityListTest.js b/js/tests/ElggPriorityListTest.js
similarity index 100%
rename from engine/js/tests/ElggPriorityListTest.js
rename to js/tests/ElggPriorityListTest.js

diff --git a/engine/js/tests/ElggSecurityTest.js b/js/tests/ElggSecurityTest.js
similarity index 100%
rename from engine/js/tests/ElggSecurityTest.js
rename to js/tests/ElggSecurityTest.js

diff --git a/engine/js/tests/ElggSessionTest.js b/js/tests/ElggSessionTest.js
similarity index 100%
rename from engine/js/tests/ElggSessionTest.js
rename to js/tests/ElggSessionTest.js

diff --git a/jsTestDriver.conf b/jsTestDriver.conf
index fc1fe0b8bb423e984122519b7fc60e07a9329480..2f732da7b8850100ad5d16568e686873f9b82346 100644 (file)
--- a/jsTestDriver.conf
+++ b/jsTestDriver.conf
@@ -2,7 +2,7 @@ server: http://localhost:42442
 \r
 load:\r
  - vendors/jquery/jquery-1.4.2.min.js\r
- - engine/js/lib/elgglib.js\r
- - engine/js/classes/*.js\r
- - engine/js/lib/*.js\r
- - engine/js/tests/*.js
\ No newline at end of file
+ - js/lib/elgglib.js\r
+ - js/classes/*.js\r
+ - js/lib/*.js\r
+ - 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 98dfc28a7c0542586f33d04f1e7a7eea4bf6f2a4..0c6fb7e884e8b1da73320c8de29d0f409f52dacb 100644 (file)
--- 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");
 }
 
 /**