Update editMajor page to use webpack bundle.

cambelem · Oct 14, 2016 · 1315a5d · 1315a5d
1 parent b1e7ec5
commit 1315a5d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/class/UI/MajorUI.php b/class/UI/MajorUI.php
@@ -14,10 +14,6 @@ public function display()
         }
 
         $tpl = array();
-        javascript('jquery');
-
-        javascriptMod('intern', 'manager');
-        javascriptMod('intern', 'editMajor');
 
         return \PHPWS_Template::process($tpl, 'intern', 'edit_major.tpl');
     }

diff --git a/javascript/editMajor/majorEditor.jsx → javascript/editMajor/editMajor.jsx b/javascript/editMajor/majorEditor.jsx → javascript/editMajor/editMajor.jsx
diff --git a/javascript/editMajor/head.js b/javascript/editMajor/head.js
diff --git a/templates/edit_major.tpl b/templates/edit_major.tpl
@@ -1,2 +1,3 @@
-
 <div id="content"></div>
+
+<script type="text/javascript" src="{source_http}mod/intern/javascript/dist/editMajor.dev.js"></script>
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
@@ -15,7 +15,8 @@ module.exports = {
         editDepartment: JS_DIR + '/editDepartment/deptEditor.jsx',
         stateList: JS_DIR + '/stateList/StateList.jsx',
         emergencyContact: JS_DIR + '/emergencyContact/EmgContactList.jsx',
-        facultyEdit: JS_DIR + '/facultyEdit/FacultyEdit.jsx'
+        facultyEdit: JS_DIR + '/facultyEdit/FacultyEdit.jsx',
+        editMajor: JS_DIR + '/editMajor/editMajor.jsx'
     },
     output: {
         path: path.join(JS_DIR, "dist"),

diff --git a/webpack.config.prod.js b/webpack.config.prod.js
@@ -18,7 +18,8 @@ module.exports = {
         editDepartment: JS_DIR + '/editDepartment/deptEditor.jsx',
         stateList: JS_DIR + '/stateList/StateList.jsx',
         emergencyContact: JS_DIR + '/emergencyContact/EmgContactList.jsx',
-        facultyEdit: JS_DIR + '/facultyEdit/FacultyEdit.jsx'
+        facultyEdit: JS_DIR + '/facultyEdit/FacultyEdit.jsx',
+        editMajor: JS_DIR + '/editMajor/editMajor.jsx'
     },
     output: {
         path: path.join(JS_DIR, "dist"),
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,3 @@

		<div id="content"></div>

		<script type="text/javascript" src="{source_http}mod/intern/javascript/dist/editMajor.dev.js"></script>