Anubis / Xlib

Commit 9ebdcfa0925b83d799e63881c67de766c06024ff

Authored by Steve MARECHAL
1 parent 92613c96

dojo editor is now HTML_Off_Form

Showing 1 changed file with 21 additions and 41 deletions   Show diff stats
Inline Side-by-side
calexium_lib/web/CXM_dojo.anubis
  Show/Hide comments   View file @9ebdcfa
... ... @@ -429,24 +429,14 @@ public define HTML_Off_Form
429 429 dojo_button
430 430 (
431 431 HtmlId html_id,
432   - Maybe(String) class,
  432 +// Maybe(String) class,
433 433 String name,
434   - Maybe(String) iconclass,
  434 + String iconclass,
435 435 Maybe(String) tip_msg,
436 436 String execute,
437 437 )=
438 438 literal("
439   - <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\"" +
440   - if class is
441   - {
442   - failure then "",
443   - success(class_name) then " class=\"" + class_name + "\""
444   - } +
445   - if iconclass is
446   - {
447   - failure then "",
448   - success(iconclass_name) then " iconClass=\"" + iconclass_name + "\""
449   - } + ">"
  439 + <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\" iconClass=\"" + iconclass + "\" >"
450 440 + name
451 441 + "<script type=\"dojo/method\" event=\"onClick\">"
452 442 + execute
... ... @@ -460,38 +450,28 @@ public define HTML_Off_Form
460 450 }).
461 451  
462 452 public define HTML_In_Form
463   - dojo_button
  453 + dojo_button
464 454 (
465 455 HtmlId html_id,
466   - Maybe(String) class,
  456 +// Maybe(String) class,
467 457 String name,
468   - Maybe(String) iconclass,
  458 + String iconclass,
469 459 Maybe(String) tip_msg,
470 460 String execute,
471 461 )=
472   - literal("
473   - <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\"" +
474   - if class is
475   - {
476   - failure then "",
477   - success(class_name) then " class=\"" + class_name + "\""
478   - } +
479   - if iconclass is
480   - {
481   - failure then "",
482   - success(iconclass_name) then " iconClass=\"" + iconclass_name + "\""
483   - } + ">"
484   - + name
485   - + "<script type=\"dojo/method\" event=\"onClick\">"
486   - + execute
487   - + "</script>"
488   - + "</button>" +
489   - if tip_msg is
490   - {
491   - failure then "",
492   - success(tip) then
493   - "<span dojoType=\"dijit.Tooltip\" connectId=\"" + html_id.id + "\">" + tip + "</span>"
494   - }).
  462 + literal("
  463 + <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\" iconClass=\"" + iconclass + "\" >"
  464 + + name
  465 + + "<script type=\"dojo/method\" event=\"onClick\">"
  466 + + execute
  467 + + "</script>"
  468 + + "</button>" +
  469 + if tip_msg is
  470 + {
  471 + failure then "",
  472 + success(tip) then
  473 + "<span dojoType=\"dijit.Tooltip\" connectId=\"" + html_id.id + "\">" + tip + "</span>"
  474 + }).
495 475  
496 476  
497 477 public define HTML_Off_Form
... ... @@ -515,13 +495,13 @@ public define HTML_In_Form
515 495 div([attr("dojoType", "dijit.Declaration"), attr("widgetClass", name) . attributes ],
516 496 content).
517 497  
518   -public define HTML_In_Form
  498 +public define HTML_Off_Form
519 499 dojo_editor
520 500 (
521 501 List(CoreAttrs) attributes,
522 502 HtmlId html_id,
523 503 WebArgName input_name,
524   - HTML_In_Form text,
  504 + HTML_Off_Form text,
525 505 )=
526 506 div([id(html_id.id), attr("name", input_name.name), attr("dojoType", "dijit.Editor")
527 507 ,attr("extraPlugins", "['|', 'foreColor','hiliteColor',{name:'dojox.editor.plugins.FontChoice', command:'fontName', generic:true},'fontSize','formatBlock','|','createLink','insertImage']")
... ...