Browse Source

Merge branch 'fix-codeeditor' of LInE/ivprog into master

Lucas de Souza 4 years ago
parent
commit
a6df4408d0
4 changed files with 11 additions and 2 deletions
  1. 1 0
      i18n/ui.csv
  2. 9 1
      js/iassign-integration-functions.js
  3. 1 0
      js/main.js
  4. 0 1
      js/visualUI/functions.js

+ 1 - 0
i18n/ui.csv

@@ -137,3 +137,4 @@ text_for_from,de,from,
 text_for_to,até,to,
 text_for_pass,passo,pass,
 text_relational_expression,Relacionais,Relational,
+initial_program_code,"programa {\n\n\t\tfuncao vazio inicio () {\n\t\t\t// Inicie seu codigo aqui!\n\t\t}\n}","program {\n\n\t\tfunction void main () {\n\t\t\t// Start your code here!\n\t\t}\n}",

+ 9 - 1
js/iassign-integration-functions.js

@@ -140,6 +140,7 @@ function getiLMContent () {
   // requisitado via AJAX para a captura dos dados da atividade
   $.get(iLMparameters.iLM_PARAM_Assignment, function (data) {
     //professor invocou a avaliação automática dos exercícios do bloco
+    ivprogCore.CodeEditor.initTextEditor("ivprog-text-editor");
     if (iLMparameters.iLM_PARAM_TeacherAutoEval != null) {
         teacherAutoEval(data);
         //não deve exibir nenhuma interface...
@@ -385,7 +386,14 @@ function ivprogTextualOrVisual () {
       $('.textual_coding_button').addClass('active'); 
       $('.visual_coding_button').addClass('disabled');
 
-      ivprogCore.CodeEditor.setCode(algorithm_in_ilm);
+      let textual_code = algorithm_in_ilm;
+      if(!textual_code) {
+        textual_code = ivprogCore.LocalizedStrings.getUI("initial_program_code");
+        textual_code = textual_code.replace(/\\n/g,"\n");
+        textual_code = textual_code.replace(/\\t/g,"\t");
+      }
+      
+      ivprogCore.CodeEditor.setCode(textual_code);
       ivprogCore.CodeEditor.disable(false);
     }
     if (settingsProgrammingTypes == "visual") {

+ 1 - 0
js/main.js

@@ -11,6 +11,7 @@ import * as CodeEditorAll from "./visualUI/text_editor";
 import {autoGenerateTestCaseOutput} from './util/auto_gen_output';
 
 const CodeEditor = {
+  initTextEditor: CodeEditorAll.initTextEditor,
   setCode: CodeEditorAll.setCode,
   getCode: CodeEditorAll.getCode,
   updateEditor: CodeEditorAll.updateEditor,

+ 0 - 1
js/visualUI/functions.js

@@ -873,7 +873,6 @@ export function initVisualUI () {
     }
   });
 
-  TextEditor.initTextEditor("ivprog-text-editor");
 }
 
 export function setTestCases (testCases) {