Dotclear


Ignore:
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • .hgsigs

    r4033 r4045  
    331dc51dbf8899b36afeadf4433d8df2c06198822d 0 iQEzBAABCgAdFiEEl+7zWgi24VqTXSmqvAk5t+bPcecFAluOSrkACgkQvAk5t+bPcecItAf+OAikzkRFaOQ+OD3B73F2Ob8G3x/f6ujyQ2jhMzTiQ98cOcrvaejzsxxxuA3nRXIMWpaoFOnn+pLo0bWCeumGP0G6mG3XiZ+lEWsoxwIYGGKCns2/3xwSEjxT+EOz+qV0NfPvkHDdWNme9EUA1ljAZ/qR9UgumQK30t7LxT5C+JfzXm8jVWQYhJVYtAdNgUJdn2HQE+2xu0zTJIvaHS2LVGi+Qa+exL2/RjLl88YJLyDgIoPFP8/ncYSnTFcKY4SNP8AFAwH/b7DUcYpuBEiN0xM7TbOdDihtiS/PUpbECH7aei/N6ajWil7X8nFXWXLkPCSg48p7PtHYTEVhH6ZqmQ== 
    44c4c38ac5c24062e5ee350efdcc1381bff131877e 0 iQEzBAABCgAdFiEEl+7zWgi24VqTXSmqvAk5t+bPcecFAl1nuD0ACgkQvAk5t+bPcefe9gf8Dv7p4A58EhDPUP+vbyAaMU0k98/3jXdrfxTpPQumtLVHIZYlrCUbbTAqCkTGa1JCJvgMoIulL9uGuuV5BZARhFJSqxmGzZPvjBYHuQrUt7q+6I9hUSwVPvUHyMThVASH50/KOesVsScgrpI5YdNHdCazt9wBBhK9+cFH9fFS7GiEXXbqq/QdEz0RE4ihuJUftPh8VZwpjCbgJSntoYZerzEAJec77o/O4c8BcvEx8hjx236VIR5IMPco/JA/AYaH39RfLPCM1vdg5Bjk43Ob2KRrxQEOWtmXpFJcTZkot46HHRCzn+busE9RkZj2E4HBtCH10hcx5/APTb9+4o1vbw== 
     51c6b3e6178fdab8971180df86ae19bbfd9818064 0 iQEzBAABCgAdFiEEl+7zWgi24VqTXSmqvAk5t+bPcecFAl2TD4kACgkQvAk5t+bPcee+WwgAoK5og4X7Pf6jBtCK3Uc7f0uvZuI0ZQ0igZ9x7bY6TkwfrNTiDAmeeRwz6hhIC76kgh40g9/Nu8Z3oAzWXKK39pt9kIVfawGoxxZf9Vkeyq6p1Bq/OSbXPM29Q1J9jnZCzaZfjF04N+/zU60I8tlMvM9RWHPkbU0GBwA1yERHuEbcBcgOCt3I7z47Rs+l09crQ2zt9x8+aHi20NO0xAWaEJ6im7oN0ZynLbu59mqZnfF/nH7Kg7ndKw1A2O4iIGWBun5FpXyjBoAJvEd/Sos/RsvbxlXoZBUJ649dyaxaP3MRic0InvZR+TDCZMt/1CuEQSeegQWIwqBT3YBA8SRFYg== 

  • .hgtags

    r4032 r4044  
    41411e7bcf91ef2aa22be032cf03ee41010c0b221e48 2.14.3 
    4242ffb593b20fa5980cca6496f4e0e72caebafbc7ae 2.15.1 
     4336cbcdbf3c2af8068ef0d604a25ce30087598495 2.15.2 

  • CHANGELOG

    r4034 r4046  
     1Dotclear 2.15.2 - 2019-10-01 
     2=========================================================== 
     3* Fix: Ajax saving of files in theme editor when using codemirror 
     4* Fix: Video insertion with CKEditor or LegacyEditor 
     5* Fix: Badge position for dashboard modules counters 
     6 
    17Dotclear 2.15.1 - 2019-08-29 
    28=========================================================== 

  • README.md

    r3795 r4041  
    9797Repositories: 
    9898------------- 
    99 https://hg.dotclear.org/dotclear/ (official) 
    100 https://bitbucket.org/dotclear/dotclear (Bitbucket) 
    101 https://github.com/dotclear/dotclear (Github, sync'ed with Bitbucket) 
     99https://git.dotclear.org/dotclear/ (official) 
     100https://github.com/dotclear/dotclear (Github) 
    102101 
    103102 

  • admin/js/common.js

    r4007 r4042  
    560560      // Compose badge classes 
    561561      const cls = `badge badge-${opt.id} \ 
    562 ${opt.inline ? 'badge-inline' : 'badge-block'}\ 
     562${opt.inline ? ' badge-inline' : ' badge-block'}\ 
    563563${opt.icon ? ' badge-icon' : ''}\ 
    564564${opt.type !== '' ? ` badge-${opt.type}` : ''}\ 

  • plugins/dcCKEditor/js/popup_media.js

    r4010 r4040  
    110110      // Video media 
    111111      const oplayer = $(`<div>${$('#public_player').val()}</div>`); 
    112       let flashvars = $('[name=FlashVars]', oplayer).val(); 
    113112 
    114113      const align_video = $('input[name="alignment"]:checked', insert_form).val(); 
    115  
    116       const title = insert_form.elements.title.value; 
    117       if (title) { 
    118         flashvars = `title=${encodeURI(title)}&amp;${flashvars}`; 
    119       } 
    120114 
    121115      const vw = $('#video_w').val(); 
    … …  
    125119        $('video', oplayer).attr('width', vw); 
    126120        $('object', oplayer).attr('width', vw); 
    127         flashvars = flashvars.replace(/(width=\d*)/, 'width=' + vw); 
    128121      } else { 
    129122        $('video', oplayer).removeAttr('width'); 
    130123        $('object', oplayer).removeAttr('width'); 
    131         flashvars = flashvars.replace(/(width=\d*)/, ''); 
    132124      } 
    133125      if (vh > 0) { 
    134126        $('video', oplayer).attr('height', vh); 
    135127        $('object', oplayer).attr('height', vh); 
    136         flashvars = flashvars.replace(/(height=\d*)/, 'height=' + vh); 
    137128      } else { 
    138129        $('video', oplayer).removeAttr('height'); 
    139130        $('object', oplayer).removeAttr('height'); 
    140         flashvars = flashvars.replace(/(height=\d*)/, ''); 
    141131      } 
    142132 
    143       $('[name=FlashVars]', oplayer).val(flashvars); 
    144133      let player_video = oplayer.html(); 
    145134 

  • plugins/dcLegacyEditor/js/jsToolBar/popup_media.js

    r4010 r4040  
    6969    { 
    7070      var oplayer = $(`<div>${$('#public_player').val()}</div>`); 
    71       var flashvars = $('[name=FlashVars]', oplayer).val(); 
    7271 
    7372      align = $('input[name="alignment"]:checked', insert_form).val(); 
    74  
    75       var title = insert_form.elements.title.value; 
    76       if (title) { 
    77         flashvars = 'title=' + encodeURI(title) + '&amp;' + flashvars; 
    78       } 
    7973 
    8074      var vw = $('#video_w').val(); 
    … …  
    8478        $('video', oplayer).attr('width', vw); 
    8579        $('object', oplayer).attr('width', vw); 
    86         flashvars = flashvars.replace(/(width=\d*)/, 'width=' + vw); 
    8780      } else { 
    8881        $('video', oplayer).removeAttr('width'); 
    8982        $('object', oplayer).removeAttr('width'); 
    90         flashvars = flashvars.replace(/(width=\d*)/, ''); 
    9183      } 
    9284      if (vh > 0) { 
    9385        $('video', oplayer).attr('height', vh); 
    9486        $('object', oplayer).attr('height', vh); 
    95         flashvars = flashvars.replace(/(height=\d*)/, 'height=' + vh); 
    9687      } else { 
    9788        $('video', oplayer).removeAttr('height'); 
    9889        $('object', oplayer).removeAttr('height'); 
    99         flashvars = flashvars.replace(/(height=\d*)/, ''); 
    10090      } 
    10191 
    102       $('[name=FlashVars]', oplayer).val(flashvars); 
    10392      player = oplayer.html(); 
    10493 

  • plugins/themeEditor/js/script.js

    r3980 r4036  
    1 /*global $, dotclear, editor, confirmClosePage, getData */ 
     1/*global $, dotclear, confirmClosePage, getData, codemirror_instance */ 
    22'use strict'; 
    33 
    … …  
    1313 
    1414    const data = { 
    15       file_content: (!dotclear.colorsyntax ? $(f).find('#file_content').get(0).value : editor.getValue()), 
     15      file_content: (!dotclear.colorsyntax ? $(f).find('#file_content').get(0).value : codemirror_instance.editor.getValue()), 
    1616      xd_check: $(f).find('input[name="xd_check"]').get(0).value, 
    1717      write: 1 
Note: See TracChangeset for help on using the changeset viewer.

Sites map