소스 검색

Merge branch 'improveLog' of ssh://git.lcalion.com:2245/LInE/ivprog into improveLog

Lucas de Souza 5 년 전
부모
커밋
54fb758d60
2개의 변경된 파일36개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      css/ivprog-visual-1.0.css
  2. 35 0
      js/visualUI/commands/generic_expression.js

+ 1 - 1
css/ivprog-visual-1.0.css

@@ -906,7 +906,7 @@ div.ui.checkbox.transition.visible {
 }
 
 .single_element_expression {
-	position: relative;
+	
 }
 
 .floating_parenthesis {

+ 35 - 0
js/visualUI/commands/generic_expression.js

@@ -2,12 +2,47 @@ import { Types } from '../types';
 import * as Models from '../ivprog_elements';
 import { LocalizedStrings } from '../../services/localizedStringsService';
 import * as VariableValueMenuManagement from './variable_value_menu';
+import { registerUserEvent, ActionTypes } from "../../services/userLog";
 import WatchJS from 'melanke-watchjs';
 
+window.timer = false;
+
 export function renderExpression (command, function_obj, div_to_render, expression_array) {
 
 	div_to_render.empty();
 
+	WatchJS.unwatch(command, "expression");
+	WatchJS.watch(command, "expression", function(){
+		if (window.timer)
+			return;
+		var m = div_to_render.find('.single_element_expression').not('.mouse_distance').not('.add_parentheses');
+		var s = "";
+		m.each(function(e){
+		   if ($(this).hasClass('parentheses_in_expression')) {
+		   		s += ($(this).text()) + " ";
+		   } else {
+		        s += ($(this).find('.text').text());
+		        
+		        s += ($(this).find('.var_name').text());
+
+		        s += ($(this).find('.parameters_function_called').text());
+
+		        s += ($(this).find('.value_rendered').text());
+
+		        s += " ";
+		   }
+		});
+		if (s) {
+			window.timer = true;
+		} else {
+			return;
+		}
+		registerUserEvent(function_obj.name, ActionTypes.CHANGE_COMMAND_EXP, command.type, '/', s);
+		setTimeout(function() {
+			window.timer = false;
+		}, 200);
+	}, 20, true);
+
 	if (command.type === Models.COMMAND_TYPES.attribution) {
 
 		WatchJS.unwatch(command.variable);