diff options
| author | Patrick Simianer <p@simianer.de> | 2015-10-28 13:21:39 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2015-10-28 13:21:39 +0100 |
| commit | d8829cb72d75ba79060d18d13887b5eb1433ab0f (patch) | |
| tree | d290b3497ff4db789b86c6d404ec1ad2cfb58b21 | |
| parent | e1bbf92a8bc8ae97408092a29da106821e276d20 (diff) | |
fix integration
| -rw-r--r-- | interface.php | 10 | ||||
| -rw-r--r-- | lfpe.js | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/interface.php b/interface.php index df82d97..559b249 100644 --- a/interface.php +++ b/interface.php @@ -5,10 +5,10 @@ <script src="common.js"></script> <script src="lfpe.js"></script> <link rel="stylesheet" type="text/css" href="lfpe.css" /> - <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> - <script src="derivation_editor/raphael.js" type="text/javascript" charset="utf-8"></script> + <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js" charset="utf-8"></script> + <script src="https://raw.githubusercontent.com/DmitryBaranovskiy/raphael/v2.1.2/raphael-min.js" type="text/javascript" charset="utf-8"></script> <script src="https://raw.githubusercontent.com/marmelab/Raphael.InlineTextEditing/fd578f0eddd4172e6d9b3fde4cb67576cf546dc1/raphael.inline_text_editing.js" charset="utf-8"></script> - <script src="derivation_editor/edit.js" charset="utf-8"></script> + <script src="derivation_editor/derivation-editor.js" charset="utf-8"></script> </head> <body> @@ -18,8 +18,8 @@ <!-- Derivation editor --> <div id="derivation_editor"> <div id="holder"><img style="margin:.4em" src="placeholder.png" /></div> - <input type="button" value="+" onClick="add_obj()" /> - <input type="button" value="Reset" onClick="reset_derivation_edtior(true);" /> + <input type="button" value="+" onClick="DE_add_object()" /> + <input type="button" value="Reset" onClick="DE_init();" /> </div> <!-- /Derivation editor--> @@ -154,7 +154,7 @@ function Next() // extract data from interfaces if (ui_type == 'g') { - post_edit = JSON.parse(extract_data())["target"].join(" ") + post_edit = JSON.parse(DE_extract_data())["target"].join(" ") } else { post_edit = trim(target_textarea.value); } @@ -299,7 +299,7 @@ function Next() // load data into graphical UI if (ui_type == "g") { - load_data(); + DE_init(); } // start timer |