From 849eccfcbf2d1998c2ec4826131de2a4351e4cff Mon Sep 17 00:00:00 2001
From: Tomasz Bartosiak <tomasz.bartosiak@gmail.com>
Date: Wed, 26 Jul 2017 14:25:28 +0200
Subject: [PATCH] Usunięcie problemów z usuwaniem ram
---
semantics/static/js/semantics_connections.js | 9 +++++++++
semantics/static/js/semantics_frames.js | 17 -----------------
semantics/static/js/semantics_view.js | 17 +++++++++++++----
3 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/semantics/static/js/semantics_connections.js b/semantics/static/js/semantics_connections.js
index c6fb428..ebd8335 100644
--- a/semantics/static/js/semantics_connections.js
+++ b/semantics/static/js/semantics_connections.js
@@ -1,6 +1,15 @@
var connected = {}; // dictionaries of connections and disconnections between frames and schemas
var connected_reverse = {};
+function getConnected(frame_id) { /* TODO */
+ return [];
+}
+
+function removeFrameConnections(frame_id) { /* TODO */
+ return;
+}
+
+
function memorizeConnections(arguments_connected, frames_connection){
connected = arguments_connected;
connected_reverse = frames_connection;
diff --git a/semantics/static/js/semantics_frames.js b/semantics/static/js/semantics_frames.js
index 26d90db..00c0a84 100644
--- a/semantics/static/js/semantics_frames.js
+++ b/semantics/static/js/semantics_frames.js
@@ -4,23 +4,6 @@ var free_complement_id = -1;
var free_frame_id = -1;
var free_preference_id = -1;
var semantic_opinion_vals = [];
-var connected_entries = []
-
-
-function getConnected(frames_display) {
- var i, j;
- for (i = 0; i < frames_display.length; i++) {
- lexical_units_num.push(frames_display[i].lexical_units);
- lexical_units_frames[i] = [];
-
- var frames = frames_display[i].frames;
- for (j = 0; j < frames.length; j++) {
- frame_content[frames[j].frame_id] = frames[j];
- frame_localization[frames[j].frame_id] = {"units": i, "position": j};
- lexical_units_frames[i].push(frames[j].frame_id);
- }
- }
-}
function selectedFrame() {
return "frame_" + highlighted_id + "_";
diff --git a/semantics/static/js/semantics_view.js b/semantics/static/js/semantics_view.js
index fd3261b..36c6676 100644
--- a/semantics/static/js/semantics_view.js
+++ b/semantics/static/js/semantics_view.js
@@ -818,7 +818,7 @@ function removeFromFrame() {
// highlighted_id = "26"
removeFrame(highlighted_id);
-
+
frameClick("frame_" + highlighted_id + "_");
displayFrames();
@@ -936,7 +936,10 @@ function frameClick(clicked_id) {
} else {
if (clicked_id.split('_').length == 3) { // frame click
var frame_id = clicked_id.split('_')[1];
- var local = frame_content[frame_id].local;
+ var local = true;
+ if (frame_content[frame_id] != null){
+ local = frame_content[frame_id].local;
+ }
if (highlighted_id != "") {
deselect();
@@ -972,7 +975,10 @@ function frameClick(clicked_id) {
}
} else if (clicked_id.split('_')[4] == 'lemma') { // part of lemma click
frame_id = clicked_id.split('_')[1]
- var local = frame_content[frame_id].local;
+ var local = true;
+ if (frame_content[frame_id] != null){
+ local = frame_content[frame_id].local;
+ }
if (highlighted_id != "") {
deselect();
@@ -1010,7 +1016,10 @@ function frameClick(clicked_id) {
}
} else { // argument click
frame_id = clicked_id.split('_')[1]
- var local = frame_content[frame_id].local;
+ var local = true;
+ if (frame_content[frame_id] != null){
+ local = frame_content[frame_id].local;
+ }
if (highlighted_id != "") {
deselect();
--
libgit2 0.22.2