Bladeren bron

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

Lucas de Souza 5 jaren geleden
bovenliggende
commit
8eb6344213

+ 1 - 1
.ima_version.json

@@ -1 +1 @@
-{ "version":"2019_02_20 13_02" }
+{ "version":"2019_02_20 13_06" }

+ 6 - 11
build/ivprog.bundle.js

@@ -103,7 +103,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /*! exports provided: version, default */
 /***/ (function(module) {
 
-module.exports = {"version":"2019_02_20 13_02"};
+module.exports = {"version":"2019_02_20 13_06"};
 
 /***/ }),
 
@@ -187,7 +187,7 @@ module.exports =
 /* 0 */
 /***/ (function(module, exports, __webpack_require__) {
 
-// Generated from /tmp/tmp-10204hirqEgoAkDJP/ivprog.g4 by ANTLR 4.7
+// Generated from /tmp/tmp-8756ZA1NOwQEJYii/ivprog.g4 by ANTLR 4.7
 // jshint ignore: start
 var antlr4 = __webpack_require__(2);
 
@@ -778,7 +778,7 @@ module.exports =
 /* 0 */
 /***/ (function(module, exports, __webpack_require__) {
 
-// Generated from /tmp/tmp-10204e7aXal4yPdL3/ivprog.g4 by ANTLR 4.7
+// Generated from /tmp/tmp-8756QdkQEPXJtcgX/ivprog.g4 by ANTLR 4.7
 // jshint ignore: start
 var antlr4 = __webpack_require__(2);
 
@@ -1432,7 +1432,7 @@ module.exports =
 /* 0 */
 /***/ (function(module, exports, __webpack_require__) {
 
-// Generated from /tmp/tmp-102049NzqbuCAfjXL/ivprog.g4 by ANTLR 4.7
+// Generated from /tmp/tmp-8756Kqb5Q92RsTUc/ivprog.g4 by ANTLR 4.7
 // jshint ignore: start
 var antlr4 = __webpack_require__(2);
 
@@ -18087,8 +18087,8 @@ function createFloatingCommand(function_obj, function_container, command_type, m
 	floatingObject.css("position", "absolute");
 	mouse_event.type = "mousedown.draggable";
 	mouse_event.target = floatingObject[0];
-	floatingObject.css("left", mouse_event.pageX - 15);
-	floatingObject.css("top", mouse_event.pageY - 15);
+	floatingObject.css("left", mouse_event.pageX);
+	floatingObject.css("top", mouse_event.pageY);
 	floatingObject.trigger(mouse_event);
 }
 
@@ -19982,11 +19982,6 @@ function renderMenu(command, dom_where_render, function_obj, dom_command) {
 
 function addHandlers(command, dom_where_render, function_obj, dom_command) {
 
-	console.log('command, dom_where_render, function_obj, dom_command');
-	console.log(command, dom_where_render, function_obj, dom_command);
-
-	console.log(dom_where_render.parents());
-
 	dom_where_render.find('.menu_commands').dropdown({
 		on: 'hover'
 	});

File diff suppressed because it is too large
+ 1 - 1
build/ivprog.bundle.js.map


+ 2 - 2
js/visualUI/commands.js

@@ -127,8 +127,8 @@ export function createFloatingCommand (function_obj, function_container, command
 	floatingObject.css("position", "absolute");
 	mouse_event.type = "mousedown.draggable";
 	mouse_event.target = floatingObject[0];
-	floatingObject.css("left", mouse_event.pageX - 15);
-	floatingObject.css("top", mouse_event.pageY - 15);
+	floatingObject.css("left", mouse_event.pageX);
+	floatingObject.css("top", mouse_event.pageY);
 	floatingObject.trigger(mouse_event);
 }
 

+ 0 - 5
js/visualUI/commands/contextualized_menu.js

@@ -36,11 +36,6 @@ export function renderMenu (command, dom_where_render, function_obj, dom_command
 
 function addHandlers (command, dom_where_render, function_obj, dom_command) {
 
-	console.log('command, dom_where_render, function_obj, dom_command');
-	console.log(command, dom_where_render, function_obj, dom_command);
-
-	console.log(dom_where_render.parents());
-
 	dom_where_render.find('.menu_commands').dropdown({
       on: 'hover'
     });

+ 1 - 1
js/visualUI/functions.js

@@ -17,7 +17,7 @@ import * as AlgorithmManagement from './algorithm';
 import * as Utils from './utils';
 import VersionInfo from './../../.ima_version.json';
 
-import '../Sortable.js';
+import '../Sortable.js'; 
 
 var counter_new_functions = 0;
 var counter_new_parameters = 0;