[dev] [commit] r1051 - phplib wwwbase/js

[automailer at dexonline.ro]

Author: cata
Date: Mon Jan  6 18:47:23 2014
New Revision: 1051

Log:
Fix easyui tree bug: getChildren() fails on leaves and needs to be special cased.

Modified:
   phplib/SmartyWrap.php
   wwwbase/js/lexemEdit.js

Modified: phplib/SmartyWrap.php
==============================================================================
--- phplib/SmartyWrap.php	Mon Jan  6 17:44:04 2014	(r1050)
+++ phplib/SmartyWrap.php	Mon Jan  6 18:47:23 2014	(r1051)
@@ -197,7 +197,7 @@
       case 'hangman':          self::$jsFiles[15] = 'hangman.js?v=5'; break;
       case 'mill':             self::$jsFiles[16] = 'mill.js?v=3'; break;
       case 'wotd':             self::$jsFiles[17] = 'wotd.js?v=1';
-      case 'lexemEdit':        self::$jsFiles[18] = 'lexemEdit.js?v=8'; break;
+      case 'lexemEdit':        self::$jsFiles[18] = 'lexemEdit.js?v=9'; break;
       case 'jcrop':            self::$jsFiles[19] = 'jquery.Jcrop.min.js?v=2'; break;
       case 'easyui':           self::$jsFiles[20] = 'easyui-1.3.5/easyloader.js?v=1'; break;
       case 'select2':          self::$jsFiles[21] = 'select2.min.js?v=3'; break;

Modified: wwwbase/js/lexemEdit.js
==============================================================================
--- wwwbase/js/lexemEdit.js	Mon Jan  6 17:44:04 2014	(r1050)
+++ wwwbase/js/lexemEdit.js	Mon Jan  6 18:47:23 2014	(r1051)
@@ -111,6 +111,15 @@
   return text.toUpperCase().indexOf(term.toUpperCase()) != -1;
 }
 
+// For some reason .tree('getChildren') fails on leaves.
+function meaningTreeGetChildren(node) {
+  if (node.children) {
+    return $('#meaningTree').tree('getChildren', node.target);
+  } else {
+    return new Array();
+  }
+}
+
 function addMeaning() {
   if (!meaningEditorUnchanged()) {
     return false;
@@ -154,7 +163,7 @@
   }
   var node = $('#meaningTree').tree('getSelected');
   if (node) {
-    var numChildren = $('#meaningTree').tree('getChildren', node.target).length;
+    var numChildren = meaningTreeGetChildren(node).length;
     if (!numChildren || confirm('Confirmați ștergerea sensului și a tuturor subsensurilor?')) {
       $('#meaningTree').tree('remove', node.target);
     }
@@ -276,7 +285,7 @@
                  'synonymIds': jqNode.find('span.synonymIds').text(),
                  'antonymIds': jqNode.find('span.antonymIds').text(),
                });
-  var children = $('#meaningTree').tree('getChildren', node.target);
+  var children = meaningTreeGetChildren(node);
   for (var i = 0; i < children.length; i++) {
     meaningTreeWalk(children[i], results, level + 1);
   }