Home Explore Help
Sign In
LInE
/
iVProg
2
0
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Implement jquery-ui cdn link

Remove unused files from webpack copy plugin
Lucas de Souza 5 years ago
parent
c1ca77ac15
commit
eba9901e9b
4 changed files with 33 additions and 41 deletions
Unified View Show Diff Stats
  1. 13 11
      js/iassign-integration-functions.js
  2. 13 17
      js/visualUI/functions.js
  3. 7 11
      templates/index.html
  4. 0 2
      webpack.config.js

+ 13 - 11
js/iassign-integration-functions.js
View File 

@@ -237,15 +237,6 @@ function prepareActivityToStudent (ilm_cont) {
 
 
 
 // Função para organizar se para criação, visualização ou resolução de atividade
 
 // Função para organizar se para criação, visualização ou resolução de atividade
 
 function prepareEnvironment () {
 
 function prepareEnvironment () {
 
-    if ((iLMparameters.iLM_PARAM_AssignmentURL == "true") && (iLMparameters.iLM_PARAM_SendAnswer == "true")) {
 
-        prepareActivityCreation();
 
-    }
 
-}
 
-
 
-$(document).ready(function() {
 
-
 
-    // Disable by default...
 
-    $('.assessment_button').addClass('disabled');
 
 
 
     // Se iLM_PARAM_SendAnswer for false, então trata-se de resolução de atividade,
 
     // Se iLM_PARAM_SendAnswer for false, então trata-se de resolução de atividade,
 
     // portanto, a "DIV" de resolução é liberada
 
     // portanto, a "DIV" de resolução é liberada
 
@@ -271,12 +262,23 @@ $(document).ready(function() {
 
     } else {
 
     } else {
 
         renderAlgorithm();
 
         renderAlgorithm();
 
     }
 
     }
 
+
 
+    if ((iLMparameters.iLM_PARAM_AssignmentURL == "true") && (iLMparameters.iLM_PARAM_SendAnswer == "true")) {
 
+        prepareActivityCreation();
 
+    }
 
+}
 
+
 
+function iassingIntegration () {
 
+
 
+    // Disable by default...
 
+    $('.assessment_button').addClass('disabled');
 
+
 
     if (inIframe()) {
 
     if (inIframe()) {
 
         orderIcons();
 
         orderIcons();
 
         orderWidth();
 
         orderWidth();
 
     }
 
     }
 
-
 
-});
 
+    prepareEnvironment();
 
+}
 
 
 
 // Função para preparar a interface para o professor criar atividade:
 
 // Função para preparar a interface para o professor criar atividade:
 
 function prepareActivityCreation () {
 
 function prepareActivityCreation () {

+ 13 - 17
js/visualUI/functions.js
View File 

@@ -681,7 +681,7 @@ function addSortableHandler (element, id_function) {
 
 
 
 export function initVisualUI () {
 
 export function initVisualUI () {
 
   // MUST USE CONST, LET, OR VAR !!!!!!
 
   // MUST USE CONST, LET, OR VAR !!!!!!
 
-  const mainDiv = $('#visual-main-div');
 
+  // const mainDiv = $('#visual-main-div');
 
   // fill mainDiv with functions and globals...
 
   // fill mainDiv with functions and globals...
 
   // renderAlgorithm()...
 
   // renderAlgorithm()...
 
   $('.add_function_button').on('click', () => {
 
   $('.add_function_button').on('click', () => {
 
@@ -719,21 +719,6 @@ export function initVisualUI () {
 
     window.open('https://www.usp.br/line/ivprog/', '_blank');
 
     window.open('https://www.usp.br/line/ivprog/', '_blank');
 
   });
 
   });
 
   $('.main_title h2').prop('title', LocalizedStrings.getUI('text_ivprog_description'));
 
   $('.main_title h2').prop('title', LocalizedStrings.getUI('text_ivprog_description'));
 
-}
 
-
 
-export function setTestCases (testCases) {
 
-  _testCases = testCases;
 
-}
 
-
 
-export function getTestCases () {
 
-  // Deep clone of test cases to avoid unauthorized modification
 
-  // TODO: It may be not possible to use this once custom test are fully implemented 
-  return JSON.parse(JSON.stringify(_testCases));
 
-}
 
-
 
-var is_iassign = false;
 
-
 
-$( document ).ready(function() {
 
 
 
   var time_show = 750;
 
   var time_show = 750;
 
   $('.visual_coding_button').popup({
 
   $('.visual_coding_button').popup({
 
@@ -834,8 +819,19 @@ $( document ).ready(function() {
 
        updateSequenceGlobals(evt.oldIndex, evt.newIndex);
 
        updateSequenceGlobals(evt.oldIndex, evt.newIndex);
 
     }
 
     }
 
   });
 
   });
 
+}
 
 
 
-});
 
+export function setTestCases (testCases) {
 
+  _testCases = testCases;
 
+}
 
+
 
+export function getTestCases () {
 
+  // Deep clone of test cases to avoid unauthorized modification
 
+  // TODO: It may be not possible to use this once custom test are fully implemented 
+  return JSON.parse(JSON.stringify(_testCases));
 
+}
 
+
 
+var is_iassign = false;
 
 
 
 function updateSequenceParameters (oldIndex, newIndex, function_obj) {
 
 function updateSequenceParameters (oldIndex, newIndex, function_obj) {
 
   function_obj.parameters_list.splice(newIndex, 0, function_obj.parameters_list.splice(oldIndex, 1)[0]);
 
   function_obj.parameters_list.splice(newIndex, 0, function_obj.parameters_list.splice(oldIndex, 1)[0]);

+ 7 - 11
templates/index.html
View File 

@@ -2,11 +2,6 @@
 
 <html>
 
 <html>
 
   <head>
 
   <head>
 
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-    <meta http-equiv="cache-control" content="no-cache">
 
-    <meta http-equiv="cache-control" content="no-store">
 
-    <meta http-equiv="cache-control" content="max-age=0">
 
-    <meta http-equiv="expires" content="-1">
 
-    <meta http-equiv="pragma" content="no-cache">
 
     <title></title>
 
     <title></title>
 
     <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
 
     <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.css" 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.css" 
@@ -18,7 +13,11 @@
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.js"
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.js"
 
       integrity="sha256-t8GepnyPmw9t+foMh3mKNvcorqNHamSKtKRxxpUEgFI="
 
       integrity="sha256-t8GepnyPmw9t+foMh3mKNvcorqNHamSKtKRxxpUEgFI="
 
       crossorigin="anonymous"></script>
 
       crossorigin="anonymous"></script>
 
-    
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"
 
+      integrity="sha256-KM512VNnjElC30ehFwehXjx1YCHPiQkOPmqnrWtpccM="
 
+      crossorigin="anonymous"></script>
 
+    <script src="js/Sortable.js"></script>
 
+    <script src="js/iassign-integration-functions.js"></script>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
 
 
@@ -108,10 +107,6 @@
 
 
 
   </div>
 
   </div>
 
   </body>
 
   </body>
 
-  <script src="js/jquery-ui.js"></script>
 
-  <script src="js/semantic-buttons.js"></script>
 
-  <script src="js/Sortable.js"></script>
 
-  <script src="js/iassign-integration-functions.js"></script>
 
   <script>
 
   <script>
 
     var mouseX;
 
     var mouseX;
 
     var mouseY;
 
     var mouseY;
 
@@ -148,8 +143,9 @@
 
         $('.created_element').css('left', mouseX);*/
 
         $('.created_element').css('left', mouseX);*/
 
       });
 
       });
 
       ivprogCore.LocalizedStrings.updateTagText();
 
       ivprogCore.LocalizedStrings.updateTagText();
 
+      
+      iassingIntegration();
 
       ivprogCore.initVisualUI();
 
       ivprogCore.initVisualUI();
 
-      prepareEnvironment();
 
     });
 
     });
 
   </script>
 
   </script>
 
 </html>
 
 </html>

+ 0 - 2
webpack.config.js
View File 

@@ -58,8 +58,6 @@ module.exports = {
 
       new CopyPlugin([
 
       new CopyPlugin([
 
         {from:"css/ivprog-visual-1.0.css", to:path.resolve(__dirname, 'build/css')},
 
         {from:"css/ivprog-visual-1.0.css", to:path.resolve(__dirname, 'build/css')},
 
         {from:"css/ivprog-term.css", to:path.resolve(__dirname, 'build/css')},
 
         {from:"css/ivprog-term.css", to:path.resolve(__dirname, 'build/css')},
 
-        {from:'js/semantic/semantic-buttons.js', to:path.resolve(__dirname, 'build/js')},
 
-        {from:'js/jquery-ui.js', to:path.resolve(__dirname, 'build/js')},
 
         {from:'js/Sortable.js', to:path.resolve(__dirname, 'build/js')},
 
         {from:'js/Sortable.js', to:path.resolve(__dirname, 'build/js')},
 
         {from:'js/iassign-integration-functions.js', to:path.resolve(__dirname, 'build/js')},
 
         {from:'js/iassign-integration-functions.js', to:path.resolve(__dirname, 'build/js')},
 
         /*{from:'index.html', to:path.resolve(__dirname, 'build')},
 
         /*{from:'index.html', to:path.resolve(__dirname, 'build')},