Начало Каталог Помощ
Вход
marcelovbcfilho
/
iVProg
разклонено от LInE/iVProg
1
0
Разклонения 0
Файлове
Преглед на файлове

Fix img copy

Fix unaryApp bug
Lucas de Souza преди 5 години
родител
d73147543e
ревизия
552907cb1e
променени са 4 файла, в които са добавени 14 реда и са изтрити 11 реда
Обединен изглед Покажи статистика за разликите
  1. 5 1
      js/processor/compatibilityTable.js
  2. 4 7
      js/visualUI/commands/generic_expression.js
  3. 3 3
      templates/runner.html
  4. 2 0
      webpack.config.js

+ 5 - 1
js/processor/compatibilityTable.js
Целия файл 

@@ -204,7 +204,11 @@ export function resultTypeAfterUnaryOp (operator, leftExpressionType) {
 
     if(leftExpressionType instanceof MultiType){
 
     if(leftExpressionType instanceof MultiType){
 
       return leftExpressionType;
 
       return leftExpressionType;
 
     }
 
     }
 
-    return unaryMap.get(operator)[leftExpressionType.ord];
 
+    const resultType = unaryMap.get(operator)[leftExpressionType.ord];
 
+    if (resultType == null) {
 
+      return Types.UNDEFINED;
 
+    }
 
+    return resultType;
 
   } catch (e) {
 
   } catch (e) {
 
     if (e instanceof TypeError) {
 
     if (e instanceof TypeError) {
 
       return Types.UNDEFINED;
 
       return Types.UNDEFINED;

+ 4 - 7
js/visualUI/commands/generic_expression.js
Целия файл 

@@ -1,9 +1,6 @@
 
-import $ from 'jquery';
 
 import { Types } from '../types';
 
 import { Types } from '../types';
 
 import * as Models from '../ivprog_elements';
 
 import * as Models from '../ivprog_elements';
 
 import { LocalizedStrings } from '../../services/localizedStringsService';
 
 import { LocalizedStrings } from '../../services/localizedStringsService';
 
-import * as GlobalsManagement from '../globals';
 
-import * as VariablesManagement from '../variables';
 
 import * as VariableValueMenuManagement from './variable_value_menu';
 
 import * as VariableValueMenuManagement from './variable_value_menu';
 
 import WatchJS from 'melanke-watchjs';
 
 import WatchJS from 'melanke-watchjs';
 
 
 
@@ -79,16 +76,16 @@ export function renderExpression (command, function_obj, div_to_render, expressi
 
 	    sort: false,
 
 	    sort: false,
 
 	    filter: '.not_allowed',
 
 	    filter: '.not_allowed',
 
 	    
 	    
-	    onStart: function(event) {
 
+	    onStart: function() {
 
 	    	$('body').append(lixeira);
 
 	    	$('body').append(lixeira);
 
 	    	lixeira.css('display', 'block');
 
 	    	lixeira.css('display', 'block');
 
 			lixeira.css('top', window.posY + 70, '!important');
 
 			lixeira.css('top', window.posY + 70, '!important');
 
 			lixeira.css('left', window.posX - 20, '!important');
 
 			lixeira.css('left', window.posX - 20, '!important');
 
 	    },
 
 	    },
 
-	    onMove: function(event) {
 
+	    onMove: function() {
 
 	    	lixeira.addClass('color_test');
 
 	    	lixeira.addClass('color_test');
 
 	    },
 
 	    },
 
-	    onEnd: function(event) {
 
+	    onEnd: function() {
 
 	    	lixeira.remove();
 
 	    	lixeira.remove();
 
 	    	div_to_render.find('.ghost').removeClass('ghost');
 
 	    	div_to_render.find('.ghost').removeClass('ghost');
 
 	    }
 
 	    }
 
@@ -309,7 +306,7 @@ function renderAddParenthesis (command, function_obj, div_to_render, expression_
 
 			renderGhostParentheses(actual_target, command, function_obj, div_to_render, expression_array);
 
 			renderGhostParentheses(actual_target, command, function_obj, div_to_render, expression_array);
 
 		});
 
 		});
 
 
 
-		div_to_render.on('mouseleave', function(evt) {
 
+		div_to_render.on('mouseleave', function() {
 
 			/*window.open_parentheses.remove();
 
 			/*window.open_parentheses.remove();
 
 			window.close_parentheses.remove();*/
 
 			window.close_parentheses.remove();*/
 
 		});
 
 		});

+ 3 - 3
templates/runner.html
Целия файл 

@@ -4,7 +4,7 @@
 
 
 
   <link rel="stylesheet" type="text/css" href="css/ivprog-term.css">
 
   <link rel="stylesheet" type="text/css" href="css/ivprog-term.css">
 
 
 
-  <link rel="stylesheet" type="text/css" href="css/semantic.min.css">
 
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.css" integrity="sha256-9mbkOfVho3ZPXfM7W8sV2SndrGDuh7wuyLjtsWeTI1Q=" crossorigin="anonymous" />
 
   <style>
 
   <style>
 
     .ivprog-io-output {
 
     .ivprog-io-output {
 
       border: 1px solid gainsboro;
 
       border: 1px solid gainsboro;
 
@@ -25,7 +25,8 @@
 
     }
 
     }
 
   </style>
 
   </style>
 
   <title></title>
 
   <title></title>
 
-  <script type="text/javascript" src="js/jquery-3.3.1.min.js"></script>
 
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
 
+  <script type="text/javascript" src="js/jquery.json-editor.min.js"></script>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
     <div style="padding-top: 50px;content: ''"></div>
 
     <div style="padding-top: 50px;content: ''"></div>
 
@@ -67,7 +68,6 @@
 
   
   
   
   
 </body>
 
 </body>
 
-<script type="text/javascript" src="js/jquery.json-editor.min.js"></script>
 
 <script>
 
 <script>
 
   ( function () {
 
   ( function () {
 
     ivprogCore.runner();
 
     ivprogCore.runner();

+ 2 - 0
webpack.config.js
Целия файл 

@@ -60,6 +60,8 @@ module.exports = {
 
         {from:"css/ivprog-term.css", to:path.resolve(__dirname, 'build/css')},
 
         {from:"css/ivprog-term.css", to:path.resolve(__dirname, 'build/css')},
 
         {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: 'img/trash-icon.png', to:path.resolve(__dirname, 'build/img')},
 
+        {from:'js/jquery.json-editor.min.js', to:path.resolve(__dirname, 'build/js')},
 
         /*{from:'index.html', to:path.resolve(__dirname, 'build')},
 
         /*{from:'index.html', to:path.resolve(__dirname, 'build')},
 
         {from:'runner.html', to:path.resolve(__dirname, 'build')},*/
 
         {from:'runner.html', to:path.resolve(__dirname, 'build')},*/
 
       ])
 
       ])