developer.jelix.org is not used any more and exists only for history. Post new tickets on the Github account.
developer.jelix.org n'est plus utilisée, et existe uniquement pour son historique. Postez les nouveaux tickets sur le compte github.

Ticket #1001: 1001-jForms-htmleditors-defaultconfig-without-skin.diff

File 1001-jForms-htmleditors-defaultconfig-without-skin.diff, 1.9 KB (added by Julien, 11 years ago)
  • lib/jelix/plugins/jforms/html/html.jformsbuilder.php

    diff -r a51fb55e8073 lib/jelix/plugins/jforms/html/html.jformsbuilder.php
    a b  
    7979                }
    8080                if(isset($gJConfig->htmleditors[$ed->config.'.config']))
    8181                    $resp->addJSLink($bp.$gJConfig->htmleditors[$ed->config.'.config']);
    82                 if(isset($gJConfig->htmleditors[$ed->config.'.skin.'.$ed->skin]))
    83                     $resp->addCSSLink($bp.$gJConfig->htmleditors[$ed->config.'.skin.'.$ed->skin]);
     82                $skin = $ed->config.'.skin.'.$ed->skin;
     83                if(isset($gJConfig->htmleditors[$skin]) && $gJConfig->htmleditors[$skin] != '')
     84                    $resp->addCSSLink($bp.$gJConfig->htmleditors[$skin]);
    8485            }
    8586            $datepicker_default_config = $gJConfig->forms['datepicker'];
    8687            foreach($v->getControls() as $ctrl){
  • lib/jelix/plugins/jforms/htmllight/htmllight.jformsbuilder.php

    diff -r a51fb55e8073 lib/jelix/plugins/jforms/htmllight/htmllight.jformsbuilder.php
    a b  
    7676                    }
    7777                    if(isset($gJConfig->htmleditors[$ed->config.'.config']))
    7878                        $resp->addJSLink($bp.$gJConfig->htmleditors[$ed->config.'.config']);
    79                     if(isset($gJConfig->htmleditors[$ed->config.'.skin.'.$ed->skin]))
    80                         $resp->addCSSLink($bp.$gJConfig->htmleditors[$ed->config.'.skin.'.$ed->skin]);
     79                    $skin = $ed->config.'.skin.'.$ed->skin;
     80                    if(isset($gJConfig->htmleditors[$skin]) && $gJConfig->htmleditors[$skin] != '')
     81                        $resp->addCSSLink($bp.$gJConfig->htmleditors[$skin]);
    8182                }
    8283            }
    8384        }