Merge pull request #7027 from code-dot-org/move_plc_js

Move the javascript for plc to the code-studio package directory
code-dot-org · Feb 27, 2016 · 42a9aed · 42a9aed
2 parents 18dd8f7 + 3166a20
commit 42a9aed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/code-studio/scripts/build-js.js b/code-studio/scripts/build-js.js
@@ -73,6 +73,14 @@ Promise.all([
       'react-only.js'
     ],
     commonFile: 'react-only'
+  })),
+
+  // Have a bundle for plc stuff - no sense in expanding this to everything yet
+  build_commands.bundle(_.extend({}, defaultOptions, {
+    filenames: [
+      'plc/perform_evaluation.js'
+    ],
+    commonFile: 'plc'
   }))
 ]).then(function (results) {
   var allStepsSucceeded = !results.some(function (result) {

diff --git a/...ets/javascripts/plc/perform_evaluation.js → code-studio/src/js/plc/perform_evaluation.js b/...ets/javascripts/plc/perform_evaluation.js → code-studio/src/js/plc/perform_evaluation.js
diff --git a/dashboard/app/views/plc/enrollment_evaluations/perform_evaluation.html.haml b/dashboard/app/views/plc/enrollment_evaluations/perform_evaluation.html.haml
@@ -1,4 +1,5 @@
-=javascript_include_tag 'plc/perform_evaluation'
+- content_for(:head) do
+  =javascript_include_tag 'js/plc'
 
 %h1 Self Evaluation for #{@course.name}