Changeset 27280

Timestamp:

12/23/08 14:21:08 (4 years ago)

Author:

hoge1e3

Message:

 

Location:

lang/javascript/nohada

Files:

• IE.html (added)
• js/objEdit.js (modified) (2 diffs)
• js/tag.js (modified) (3 diffs)
• perl/Obj.pm (modified) (1 diff)
• textEdit.html (modified) (1 diff)

lang/javascript/nohada/js/objEdit.js

@@ -18 +18 @@
       var f=t.relationFilter;
       dbFindRel( this.objID, _, _,printAll);
+          var tbl;
       function printAll (rels) {
-        var tbl=elem(["table",{id:"T"},rels.filter(f).map(attr)]);
+        tbl=elem(["table",{id:"T"},rels.filter(f).map(attr)]);
                 t.target.set([
                    tbl,["br"],
@@ -30 +31 @@
       function attr(rel,edit) {
                  if (typeof(edit)=="number") edit=false;
-                 var prevName=rel.name;
-         var prevValue=rel.val;
-                 
-                 var dispK=elem(["span",rel.name]);
-                 var dispV=elem(["span",rel.val]);
-                 var editK=elem(["input",{value: rel.name}]);
-                 var editV=elem(["input",{value: rel.val}]);
-         var k,v;
-                 if (edit) {
-                     k=elem(["td",editK]);
-                         v=elem(["td",editV]);
-                 } else {
-                     k=elem(["td",dispK]);
-                         v=elem(["td",dispV]);
-                 }
-                 var editB,delB;
-         return ["tr",k,v,
-                      ["td" , editB=elem(["button",{onclick: toggleEdit},"Edit"])],
-                      ["td" , delB=elem(["button",{onclick: delRel},"Delete"])]
-         ];
-                 function toggleEdit() {
-                     if (edit) editEnd();
-                         else editStart();
-                 }
-         function editStart() {
-            k.set(editK);
-            v.set(editV);
-                        edit=true;
-         }
-                 function editEnd() {
-            k.set(dispK);
-            v.set(dispV);
-                        var delrel=["DELREL",t.objID,prevName,prevValue];
-                        prevName=editK.value;
-                        prevValue=editV.value;
-                        dispK.set(["span",prevName]);
-                        dispV.set(["span",prevValue]);
-                        editB.value="Wait..";
-                        db(["PROGN",
-                           delrel,
-                           ["MAKEREL",t.objID,prevName,prevValue]
-                        ],next);
-                        function next() {                       editB.value="End"; }
-                        edit=false;
-                 }
-                 function delRel() {
-                    db(["DELREL",t.objID,prevName,prevValue],next);
-                        function next() {k.set();v.set();};
-                 }
+                         
+         return ["tr",function (tr) {
+                         var prevName=rel.name;
+                 var prevValue=rel.val;
+                         function attrFilled() {
+                             var r= (prevName && prevName.length>0) &&
+                                                (prevValue && prevValue.length>0);
+                                  //alert(prevName+" "+prevValue+" "+r);
+                                  return r;
+                         }
+                         var dispK=elem(["span",rel.name]);
+                         var dispV=elem(["span",rel.val]);
+                         var editK=elem(["input",{value: rel.name, onEnter:editEnd}]);
+                         var editV=elem(["input",{value: rel.val, onEnter:editEnd}]);
+                 var k,v;
+                         if (edit) {
+                             k=elem(["td",editK]);
+                                 v=elem(["td",editV]);
+                         } else {
+                             k=elem(["td",dispK]);
+                                 v=elem(["td",dispV]);
+                         }
+                         var editB,delB;
+                         
+                      tr.add([
+                        k,v,
+                        ["td" , editB=elem(["button",{onclick: toggleEdit},"Edit"])],
+                        ["td" , delB=elem(["button",{onclick: delRel},"Delete"])]
+                          ]);
+                          
+                      function delRel() {
+                             if (attrFilled()) {
+                                        db(["DELREL",t.objID,prevName,prevValue],next);
+                             } else next();
+                                 function next() {tbl.removeChild(tr);};
+                      }
+                     function toggleEdit() {
+                             if (edit) editEnd();
+                                 else editStart();
+                         }
+                 function editStart() {
+                                editB.innerHTML="OK";
+
+                    k.set(editK);
+                    v.set(editV);
+                                edit=true;
+                 }
+                         function editEnd() {
+                            //return alert("bug gaaru");
+                    k.set(dispK);
+                    v.set(dispV);
+                                var delrel=["DELREL",t.objID,prevName,prevValue];
+                                prevName=editK.value;
+                                prevValue=editV.value;
+                            if (!attrFilled()) {
+                                   delRel();
+                                   return;
+                                }
+                                dispK.set(["span",prevName]);
+                                dispV.set(["span",prevValue]);
+                                editB.value="Wait..";
+                                db(["PROGN",
+                                   delrel,
+                                   ["MAKEREL",t.objID,prevName,prevValue]
+                                ],next);
+                                function next() {                       editB.innerHTML="Edit"; }
+                                edit=false;
+                         }
+
+         }];
       }
    }

lang/javascript/nohada/js/tag.js

@@ -8 +8 @@
    insertAt: function (index,elem) {
       return insertAt(this, index, elem);
+   },
+   attr: function (obj) {
+      elemObj(this,obj);
    }
 });
-
 
 function elem(target, a) {
@@ -73 +75 @@
   if (o instanceof HTMLElement) {target.appendChild(o);return o;}
   for (var i in o) {
+       var v=o[i];
      if (i.match(/^on/)) {//alert(i+"  "+o+" / "+Object.toJSON(o));
-        if (target.addEventListener) {
-           target.addEventListener(i.substring(2).toLowerCase(),o[i],false);
-        } else {
-           target.attachEvent(i.toLowerCase(),o[i]);
+        i=i.toLowerCase();
+                if (i=="onenter") {
+              i="onkeydown";
+                  var pv=v;
+                  v=function ent(e) {
+                        if (e.keyCode==13) pv();
+                  };
+            }
+        if (target.addEventListener) {// FF
+           target.addEventListener(i.substring(2),v,false);
+        } else {//IE
+           target.attachEvent(i,function () {
+                      v(window.event);
+                        });
         }
      } else {
@@ -91 +104 @@
         }
 }
+
+

lang/javascript/nohada/perl/Obj.pm

@@ -439 +439 @@
 EOF
         my $where={};
+        return if (
+           not $cmd->[1] or
+           not $cmd->[2] or
+           not $cmd->[3]);
         $where->{obj} = $cmd->[1];
         $where->{name}= $cmd->[2] if ($cmd->[2] and not &isAny($cmd->[2]));
-        $where->{val} = $cmd->[3] if ($cmd->[2] and not &isAny($cmd->[3]));
+        $where->{val} = $cmd->[3] if ($cmd->[3] and not &isAny($cmd->[3]));
         $where->{role}=&Session::getRole;
       return &exeRaw(["DELETE",$relName,$where]);

lang/javascript/nohada/textEdit.html

@@ -93 +93 @@
    $("text").value="";
    content="";
-   $("id").value="";
+   $("id").set();
    obj=null;
 }