diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-05-29 17:34:43 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-05-29 17:34:43 +0200 |
| commit | f36e6917bd73a56dc0c7468b4849920df4088154 (patch) | |
| tree | b63d02ae3e5ffc0815de009407363e0cf906f547 /addons/web_editor | |
| parent | bc0173c2d58ac26d80cb2f483a95c0c13b047dab (diff) | |
| parent | 37eed7c509fb5846c89ef37046df4b3cab299719 (diff) | |
[MERGE] forward port branch saas-11.3 up to 37eed7c509f
Diffstat (limited to 'addons/web_editor')
8 files changed, 222 insertions, 402 deletions
diff --git a/addons/web_editor/i18n/tr.po b/addons/web_editor/i18n/tr.po index 619a84af27d..228dd930fa4 100644 --- a/addons/web_editor/i18n/tr.po +++ b/addons/web_editor/i18n/tr.po @@ -35,7 +35,7 @@ msgstr "" #: code:addons/web_editor/static/src/xml/editor.xml:193 #, python-format msgid "(URL or Embed)" -msgstr "" +msgstr "(URL ya da Gömülü)" #. module: web_editor #. openerp-web @@ -47,32 +47,32 @@ msgstr "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "25% Black" -msgstr "" +msgstr "%25 Siyah" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "25% White" -msgstr "" +msgstr "%25 Beyaz" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "50% Black" -msgstr "" +msgstr "%50 Siyah" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "50% White" -msgstr "" +msgstr "%50 Beyaz" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "75% Black" -msgstr "" +msgstr "%75 Siyah" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "75% White" -msgstr "" +msgstr "%75 Beyaz" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.snippets @@ -93,7 +93,7 @@ msgstr "" #: code:addons/web_editor/static/src/xml/editor.xml:198 #, python-format msgid "Accepts" -msgstr "" +msgstr "Kabuller" #. module: web_editor #. openerp-web @@ -119,33 +119,33 @@ msgstr "Bir resim URL ekle" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.snippets msgid "Add blocks" -msgstr "" +msgstr "Reklam Engelleyici" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:966 #, python-format msgid "Align center" -msgstr "" +msgstr "Merkeze hizalama" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:965 #, python-format msgid "Align left" -msgstr "" +msgstr "Sola hizala" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:967 #, python-format msgid "Align right" -msgstr "" +msgstr "Sağa hizala" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Alpha" -msgstr "" +msgstr "Alpha" #. module: web_editor #. openerp-web @@ -159,7 +159,7 @@ msgstr "Alternatif Yükleme" #: code:addons/web_editor/static/src/xml/editor.xml:315 #, python-format msgid "Assign a focal point that will always be visible" -msgstr "" +msgstr "Her zaman görünecek bir merkez noktaya hizala" #. module: web_editor #: model:ir.model.fields,field_description:web_editor.field_ir_attachment__local_url @@ -186,47 +186,47 @@ msgstr "Arkaplan Rengi" #: code:addons/web_editor/static/src/js/editor/snippets.options.js:950 #, python-format msgid "Background Image Sizing" -msgstr "" +msgstr "Arka Plan Resim Boyutu" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:354 #, python-format msgid "Background height" -msgstr "" +msgstr "Arkaplan Yüksekliği" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:364 #, python-format msgid "Background position" -msgstr "" +msgstr "Arkaplan Konumu" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:386 #, python-format msgid "Background repeat" -msgstr "" +msgstr "Arkaplan Tekrarı" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:342 #, python-format msgid "Background size" -msgstr "" +msgstr "Arkaplan Boyutu" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:345 #, python-format msgid "Background width" -msgstr "" +msgstr "Arkaplan Genişliği" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Beta" -msgstr "" +msgstr "Beta" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker @@ -245,28 +245,28 @@ msgstr "Blok" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:893 #, python-format msgid "Bold" -msgstr "" +msgstr "Kalın" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/widgets/ace.js:832 #, python-format msgid "Careful !" -msgstr "" +msgstr "Dikkat !" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:96 #, python-format msgid "Center" -msgstr "" +msgstr "Merkez" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/widgets/widgets.js:81 #, python-format msgid "Change media description and tooltip" -msgstr "" +msgstr "Medya tanımını ve araç bilgisini değiştir" #. module: web_editor #. openerp-web @@ -289,7 +289,7 @@ msgstr "Kod" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:959 #, python-format msgid "Code View" -msgstr "" +msgstr "Kod Görünümü" #. module: web_editor #. openerp-web @@ -310,14 +310,14 @@ msgstr "Sütun" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:62 #, python-format msgid "Common colors" -msgstr "" +msgstr "Yaygın renkler" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:310 #, python-format msgid "Contain" -msgstr "" +msgstr "İçerir" #. module: web_editor #. openerp-web @@ -331,7 +331,7 @@ msgstr "İçereği çevirmek için" #: code:addons/web_editor/static/src/xml/editor.xml:194 #, python-format msgid "Copy-paste your URL or embed code here" -msgstr "" +msgstr "URL kodunuzu ya da gömülü kodunuzu buraya kopyalayıp-yapıştırın." #. module: web_editor #. openerp-web @@ -369,7 +369,7 @@ msgstr "Özelleştirme" #: code:addons/web_editor/static/src/xml/editor.xml:198 #, python-format msgid "Dailymotion" -msgstr "" +msgstr "Dailymotion" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker @@ -388,12 +388,12 @@ msgstr "Öntanımlı" #: code:addons/web_editor/static/src/xml/editor.xml:387 #, python-format msgid "Define if/how the background image will be repeated" -msgstr "" +msgstr "Arka plan resminin tekrarlanacağını / nasıl olacağını tanımlayın" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Delta" -msgstr "" +msgstr "Delta" #. module: web_editor #. openerp-web @@ -436,7 +436,7 @@ msgstr "Belge" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:986 #, python-format msgid "Document Style" -msgstr "" +msgstr "Doküman Türü" #. module: web_editor #. openerp-web @@ -450,7 +450,7 @@ msgstr "Düzenlemek için çift-tıkla" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:913 #, python-format msgid "Drag an image here" -msgstr "" +msgstr "Buraya bir fotoğraf sürükleyin" #. module: web_editor #. openerp-web @@ -477,14 +477,14 @@ msgstr "Düzenle" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Epsilon" -msgstr "" +msgstr "Epsilon" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/widgets/ace.js:97 #, python-format msgid "Expected " -msgstr "" +msgstr "Umulan" #. module: web_editor #. openerp-web @@ -498,49 +498,49 @@ msgstr "Ekstra Küçük" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:905 #, python-format msgid "File / Image" -msgstr "" +msgstr "Dosya / Resim" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:910 #, python-format msgid "Float Left" -msgstr "" +msgstr "Sola yay" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:912 #, python-format msgid "Float None" -msgstr "" +msgstr "Asla Kaydırma" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:911 #, python-format msgid "Float Right" -msgstr "" +msgstr "Sağa Kaydır" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:974 #, python-format msgid "Font Color" -msgstr "" +msgstr "Font Rengi" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:901 #, python-format msgid "Font Family" -msgstr "" +msgstr "Font Ailesi" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:902 #, python-format msgid "Font Size" -msgstr "" +msgstr "Font Boyutu" #. module: web_editor #. openerp-web @@ -559,32 +559,32 @@ msgstr "Tam Ekran" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Gamma" -msgstr "" +msgstr "Gama" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Gray" -msgstr "" +msgstr "Gri" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Gray Dark" -msgstr "" +msgstr "Koyu Gri" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Gray Darker" -msgstr "" +msgstr "Daha Koyu Gri" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Gray Light" -msgstr "" +msgstr "Aydınlat" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Gray Lighter" -msgstr "" +msgstr "Daha fazla aydınlat" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_http @@ -596,42 +596,42 @@ msgstr "HTTP yönlendirme" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:945 #, python-format msgid "Header 1" -msgstr "" +msgstr "Başlık 1" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:946 #, python-format msgid "Header 2" -msgstr "" +msgstr "Başlık 2" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:947 #, python-format msgid "Header 3" -msgstr "" +msgstr "Başlık 3" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:948 #, python-format msgid "Header 4" -msgstr "" +msgstr "Başlık 4" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:949 #, python-format msgid "Header 5" -msgstr "" +msgstr "Başlık 5" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:950 #, python-format msgid "Header 6" -msgstr "" +msgstr "Başlık 6" #. module: web_editor #. openerp-web @@ -652,42 +652,42 @@ msgstr "İşte etkili bir şekilde tercüme etmek amacıyla kullanılan Görsell #: code:addons/web_editor/static/src/xml/editor.xml:219 #, python-format msgid "Hide Dailymotion logo" -msgstr "" +msgstr "Dailymotion logosunu gizle" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:216 #, python-format msgid "Hide Youtube logo" -msgstr "" +msgstr "Youtube logosunu gizle" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:213 #, python-format msgid "Hide fullscreen button" -msgstr "" +msgstr "Tam ekran butonunu gizle" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:210 #, python-format msgid "Hide player controls" -msgstr "" +msgstr "Oyuncu kontrollerini gizle" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:222 #, python-format msgid "Hide sharing button" -msgstr "" +msgstr "Paylaşım butonunu gizle" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:367 #, python-format msgid "Horizontal" -msgstr "" +msgstr "Yatay" #. module: web_editor #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub__id @@ -702,6 +702,8 @@ msgid "" "If you discard the current edition, all unsaved changes will be lost. You " "can cancel to return to the edition mode." msgstr "" +"Eğer mevcut düzenlemeyi iptal ederseniz, tüm kaydedilmemiş değişiklikler " +"kaybedilecek. Düzenleme moduna dönmek için iptal edebilirsiniz." #. module: web_editor #. openerp-web @@ -711,6 +713,8 @@ msgid "" "If you reset this file, all your customizations will be lost as it will be " "reverted to the default file." msgstr "" +"Eğer bu dosyayı sıfırlarsanız, tüm özelleştirmeleriniz varsayılan dosyaya " +"döndürüldüğü için kaybolur." #. module: web_editor #. openerp-web @@ -724,7 +728,7 @@ msgstr "Resim" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:915 #, python-format msgid "Image URL" -msgstr "" +msgstr "URL Resmi" #. module: web_editor #. openerp-web @@ -734,27 +738,29 @@ msgid "" "In this mode, you can only translate texts. To change the structure of the page, you must edit the master page.\n" " Each modification on the master page is automatically applied to all translated versions." msgstr "" +"Bu modda sadece metinleri çevirebilirsiniz. Sayfa yapısını değiştirmek için ana sayfayı düzenlemelisiniz.\n" +"Anasayfadaki her değişiklik tüm çevirilmiş versiyonlara otomatik olarak uygulanır." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/ace.xml:23 #, python-format msgid "Include All LESS Files" -msgstr "" +msgstr "Tüm LESS dosyalarını içerir" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/ace.xml:17 #, python-format msgid "Include Asset Bundles" -msgstr "" +msgstr "Varlık Paketlerini İçerir" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:964 #, python-format msgid "Indent" -msgstr "" +msgstr "Sipariş Ver" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker @@ -766,35 +772,35 @@ msgstr "Info" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:938 #, python-format msgid "Insert Horizontal Rule" -msgstr "" +msgstr "Yatay Kuralı Ekle" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:906 #, python-format msgid "Insert Image" -msgstr "" +msgstr "Resim Ekle" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:920 #, python-format msgid "Insert Link" -msgstr "" +msgstr "Bağlantı Ekle" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:930 #, python-format msgid "Insert Video" -msgstr "" +msgstr "Video Ekle" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:198 #, python-format msgid "Instagram" -msgstr "" +msgstr "Instagram" #. module: web_editor #. openerp-web @@ -808,28 +814,28 @@ msgstr "Yükle" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:894 #, python-format msgid "Italic" -msgstr "" +msgstr "Eğik" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:968 #, python-format msgid "Justify full" -msgstr "" +msgstr "Tam hak ver" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:981 #, python-format msgid "Keyboard shortcuts" -msgstr "" +msgstr "Klavye kısa yolları" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/ace.xml:11 #, python-format msgid "LESS (CSS)" -msgstr "" +msgstr "LESS (CSS)" #. module: web_editor #. openerp-web @@ -866,7 +872,7 @@ msgstr "" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:900 #, python-format msgid "Line Height" -msgstr "" +msgstr "Çizgi Yüksekliği" #. module: web_editor #. openerp-web @@ -880,7 +886,7 @@ msgstr "Bağlantı" #: code:addons/web_editor/static/src/xml/editor.xml:242 #, python-format msgid "Link Label" -msgstr "" +msgstr "Bağlantı Etiketi" #. module: web_editor #. openerp-web @@ -894,7 +900,7 @@ msgstr "Bağlantı oluştur" #: code:addons/web_editor/static/src/xml/editor.xml:207 #, python-format msgid "Loop" -msgstr "" +msgstr "Döngü" #. module: web_editor #. openerp-web @@ -928,7 +934,7 @@ msgstr "Sonraki" #: code:addons/web_editor/static/src/xml/editor.xml:389 #, python-format msgid "No repeat" -msgstr "" +msgstr "Tekrar yok" #. module: web_editor #. openerp-web @@ -958,7 +964,7 @@ msgstr "Tamam" #: code:addons/web_editor/static/src/js/editor/translator.js:93 #, python-format msgid "Ok, never show me this again" -msgstr "" +msgstr "Ok, bunu tekrar gösterme" #. module: web_editor #. openerp-web @@ -980,7 +986,7 @@ msgstr "Seçenekler" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:954 #, python-format msgid "Ordered list" -msgstr "" +msgstr "Sipariş listesi" #. module: web_editor #. openerp-web @@ -994,21 +1000,21 @@ msgstr "" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:114 #, python-format msgid "Padding" -msgstr "" +msgstr "Dolgu" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:962 #, python-format msgid "Paragraph" -msgstr "" +msgstr "Paragraf" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:985 #, python-format msgid "Paragraph formatting" -msgstr "" +msgstr "Paragraf formatı" #. module: web_editor #. openerp-web @@ -1049,14 +1055,14 @@ msgstr "Alıntı" #: code:addons/web_editor/static/src/js/editor/rte.js:309 #, python-format msgid "Readonly field" -msgstr "" +msgstr "Salt okunur alan" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:971 #, python-format msgid "Recent Color" -msgstr "" +msgstr "Mevcut Renk" #. module: web_editor #. openerp-web @@ -1084,14 +1090,14 @@ msgstr "Bloku Kaldır" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:899 #, python-format msgid "Remove Font Style" -msgstr "" +msgstr "Font Stilini Kaldır" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:916 #, python-format msgid "Remove Image" -msgstr "" +msgstr "Resmi Kaldır" #. module: web_editor #. openerp-web @@ -1105,21 +1111,21 @@ msgstr "Tekrarla" #: code:addons/web_editor/static/src/xml/editor.xml:390 #, python-format msgid "Repeat both" -msgstr "" +msgstr "İkisini de tekrarla" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:391 #, python-format msgid "Repeat x" -msgstr "" +msgstr "x'i tekrarla" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:392 #, python-format msgid "Repeat y" -msgstr "" +msgstr "y'yi tekrarla" #. module: web_editor #. openerp-web @@ -1134,35 +1140,35 @@ msgstr "Sıfırla" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:978 #, python-format msgid "Reset to default" -msgstr "" +msgstr "Varsayılana sıfırla" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/widgets/ace.js:490 #, python-format msgid "Reseting views is not supported yet" -msgstr "" +msgstr "Henüz desteklenmeyen görünümlerin sıfırlanması" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:907 #, python-format msgid "Resize Full" -msgstr "" +msgstr "Tamamını Yeniden Boyutlandır" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:908 #, python-format msgid "Resize Half" -msgstr "" +msgstr "Yarısını Yeniden Boyutlandır" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:909 #, python-format msgid "Resize Quarter" -msgstr "" +msgstr "Çeyreğini Yeniden Boyulandır" #. module: web_editor #. openerp-web @@ -1185,14 +1191,14 @@ msgstr "Arama" #: code:addons/web_editor/static/src/xml/snippets.xml:43 #, python-format msgid "Search Contact" -msgstr "" +msgstr "Kişi Ara" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/snippets.xml:13 #, python-format msgid "Select Parent Container" -msgstr "" +msgstr "Üst Kapsayıcı Seç" #. module: web_editor #. openerp-web @@ -1213,7 +1219,7 @@ msgstr "Resim Seç" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:914 #, python-format msgid "Select from files" -msgstr "" +msgstr "Dosyalardan seç" #. module: web_editor #. openerp-web @@ -1227,14 +1233,14 @@ msgstr "Sunucu hatas" #: code:addons/web_editor/static/src/xml/editor.xml:365 #, python-format msgid "Set the starting position of the background image." -msgstr "" +msgstr "Arkaplan resminin başlangıç konumunu belirle." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:976 #, python-format msgid "Set transparent" -msgstr "" +msgstr "Transparan ayarla" #. module: web_editor #. openerp-web @@ -1244,6 +1250,8 @@ msgid "" "Sets the width and height of the background image in percent of the parent " "element." msgstr "" +"Arka plan resminin genişliğini ve yüksekliğini üst elemanın yüzdesi olarak " +"ayarlar." #. module: web_editor #. openerp-web @@ -1279,7 +1287,7 @@ msgstr "Dönme" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:896 #, python-format msgid "Strikethrough" -msgstr "" +msgstr "Üstü Çizgili" #. module: web_editor #. openerp-web @@ -1293,7 +1301,7 @@ msgstr "Stil" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:897 #, python-format msgid "Subscript" -msgstr "" +msgstr "Abone Ol" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker @@ -1305,7 +1313,7 @@ msgstr "Başarı" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:898 #, python-format msgid "Superscript" -msgstr "" +msgstr "Üst Simge" #. module: web_editor #. openerp-web @@ -1326,14 +1334,14 @@ msgstr "Tema ID:%s" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:983 #, python-format msgid "Text formatting" -msgstr "" +msgstr "Metin Formatı" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:923 #, python-format msgid "Text to display" -msgstr "" +msgstr "Gösterilecek Metin" #. module: web_editor #. openerp-web @@ -1351,21 +1359,21 @@ msgstr "" #: code:addons/web_editor/static/src/js/widgets/widgets.js:1018 #, python-format msgid "The provided url does not reference any supported video" -msgstr "" +msgstr "Sağlanan url desteklenen hiç bir videoyu referans göstermiyor." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/widgets/widgets.js:1012 #, python-format msgid "The provided url is not valid" -msgstr "" +msgstr "Sağlanan url geçersiz" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:54 #, python-format msgid "Theme colors" -msgstr "" +msgstr "Tema renkleri" #. module: web_editor #. openerp-web @@ -1373,42 +1381,42 @@ msgstr "" #: code:addons/web_editor/static/src/js/editor/translator.js:177 #, python-format msgid "This document is not saved!" -msgstr "" +msgstr "Bu belge kaydedilmedi !" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:147 #, python-format msgid "This file is a public view attachment" -msgstr "" +msgstr "Bu belge bir ortak görünüm ekidir." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:148 #, python-format msgid "This file is attached to the current record" -msgstr "" +msgstr "Bu dosya mevcut kayda eklenmiştir." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:924 #, python-format msgid "To what URL should this link go?" -msgstr "" +msgstr "Bubağlantı hangi URL'ye gitmeli?" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:40 #, python-format msgid "Tooltip" -msgstr "" +msgstr "Bilgi Çubuğu" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/translator.js:50 #, python-format msgid "Translate Attribute" -msgstr "" +msgstr "Nitelikli Tercüme" #. module: web_editor #. openerp-web @@ -1422,7 +1430,7 @@ msgstr "İçerik Çevrildi" #: code:addons/web_editor/static/src/js/editor/translator.js:91 #, python-format msgid "Translation Info" -msgstr "" +msgstr "Çeviri Bilgisi" #. module: web_editor #. openerp-web @@ -1430,21 +1438,21 @@ msgstr "" #: model:ir.ui.view,arch_db:web_editor.colorpicker #, python-format msgid "Transparent" -msgstr "" +msgstr "Transparan" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:248 #, python-format msgid "URL or Email" -msgstr "" +msgstr "URL yada E-posta" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:895 #, python-format msgid "Underline" -msgstr "" +msgstr "Altı çizili" #. module: web_editor #. openerp-web @@ -1458,28 +1466,28 @@ msgstr "Geri Alma" #: code:addons/web_editor/static/src/js/widgets/ace.js:90 #, python-format msgid "Unexpected " -msgstr "" +msgstr "Beklenmeyen" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:921 #, python-format msgid "Unlink" -msgstr "" +msgstr "Bağlantıyı kopar" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:953 #, python-format msgid "Unordered list" -msgstr "" +msgstr "Sırasız liste" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:96 #, python-format msgid "Upload an image" -msgstr "" +msgstr "Bir resim yükleyin" #. module: web_editor #. openerp-web @@ -1493,7 +1501,7 @@ msgstr "Resim optimizasyon olmadan yükleme" #: code:addons/web_editor/static/src/xml/editor.xml:376 #, python-format msgid "Vertical" -msgstr "" +msgstr "Dikey" #. module: web_editor #. openerp-web @@ -1522,21 +1530,21 @@ msgstr "Video URL?" #: code:addons/web_editor/static/src/xml/editor.xml:193 #, python-format msgid "Video code" -msgstr "" +msgstr "Video kodu" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:198 #, python-format msgid "Vimeo" -msgstr "" +msgstr "Vimeo" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:198 #, python-format msgid "Vine.co" -msgstr "" +msgstr "Vine.co" #. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker @@ -1554,14 +1562,14 @@ msgstr "Beyaz" #: code:addons/web_editor/static/src/xml/ace.xml:10 #, python-format msgid "XML (HTML)" -msgstr "" +msgstr "XML (HTML)" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:111 #, python-format msgid "Xl" -msgstr "" +msgstr "XI" #. module: web_editor #. openerp-web @@ -1575,14 +1583,14 @@ msgstr "Çeviri modu girmek üzeresiniz." #: code:addons/web_editor/static/src/xml/editor.xml:198 #, python-format msgid "Youku" -msgstr "" +msgstr "Youku" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:198 #, python-format msgid "Youtube" -msgstr "" +msgstr "Youtube" #. module: web_editor #. openerp-web @@ -1599,14 +1607,14 @@ msgstr "ve" #: code:addons/web_editor/static/src/xml/editor.xml:379 #, python-format msgid "auto" -msgstr "" +msgstr "oto" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:112 #, python-format msgid "https://www.odoo.com/logo.png" -msgstr "" +msgstr "https://www.odoo.com/logo.png" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_attachment @@ -1708,7 +1716,7 @@ msgstr "ir.ui.view" #: code:addons/web_editor/static/src/xml/editor.xml:198 #, python-format msgid "videos" -msgstr "" +msgstr "videolar" #. module: web_editor #: model:ir.model,name:web_editor.model_web_editor_converter_test diff --git a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js index 9701b8728d2..efa57f8111c 100644 --- a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js +++ b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js @@ -472,7 +472,8 @@ define([ onImageUpload: options.onImageUpload, onImageUploadError: options.onImageUploadError, onMediaDelete: options.onMediaDelete, - onToolbarClick: options.onToolbarClick + onToolbarClick: options.onToolbarClick, + onUpload: options.onUpload, }); var styleInfo = modules.editor.styleFromNode(layoutInfo.editable()); diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js b/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js index 955b49437a8..4cd9088da75 100644 --- a/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js +++ b/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js @@ -1,256 +1,41 @@ define([ - 'summernote/core/list', - 'summernote/core/dom', - 'summernote/core/key', - 'summernote/core/agent', - 'summernote/core/range' + 'summernote/core/list', + 'summernote/core/dom', + 'summernote/core/key', + 'summernote/core/agent', + 'summernote/core/range' ], function (list, dom, key, agent, range) { - var Clipboard = function (handler) { - var $paste; - - this.attach = function (layoutInfo) { - // [workaround] getting image from clipboard - // - IE11 and Firefox: CTRL+v hook - // - Webkit: event.clipboardData - if (agent.isMSIE && agent.browserVersion > 10) { - $paste = $('<div />').attr('contenteditable', true).css({ - position : 'absolute', - left : -100000, - opacity : 0 - }); - - layoutInfo.editable().on('keydown', function (e) { - if (e.ctrlKey && e.keyCode === key.code.V) { - handler.invoke('saveRange', layoutInfo.editable()); - $paste.focus(); - - setTimeout(function () { - pasteByHook(layoutInfo); - }, 0); - } - }); - - layoutInfo.editable().before($paste); - } else { - layoutInfo.editable().on('paste', pasteByEvent); - } - }; - - var pasteByHook = function (layoutInfo) { - var $editable = layoutInfo.editable(); - var node = $paste[0].firstChild; - - if (dom.isImg(node)) { - var dataURI = node.src; - var decodedData = atob(dataURI.split(',')[1]); - var array = new Uint8Array(decodedData.length); - for (var i = 0; i < decodedData.length; i++) { - array[i] = decodedData.charCodeAt(i); - } - - var blob = new Blob([array], { type : 'image/png' }); - blob.name = 'clipboard.png'; - - handler.invoke('restoreRange', $editable); - handler.invoke('focus', $editable); - handler.insertImages(layoutInfo, [blob]); - } else { - var pasteContent = $('<div />').html($paste.html()).html(); - handler.invoke('restoreRange', $editable); - handler.invoke('focus', $editable); - - if (pasteContent) { - handler.invoke('pasteHTML', $editable, pasteContent); - } - } - - $paste.empty(); - }; - - /** - * paste by clipboard event - * - * @param {Event} event - */ - var pasteByEvent = function (event) { - var clipboardData = event.originalEvent.clipboardData; - var layoutInfo = dom.makeLayoutInfo(event.currentTarget || event.target); - var $editable = layoutInfo.editable(); - - if (["INPUT", "TEXTAREA"].indexOf(event.target.tagName) !== -1) { - return; - } - - if (clipboardData && clipboardData.items && clipboardData.items.length) { - var item = list.head(clipboardData.items); - if (item.kind === 'file' && item.type.indexOf('image/') !== -1) { - handler.insertImages(layoutInfo, [item.getAsFile()]); - } - handler.invoke('editor.afterCommand', $editable); - } - - event.preventDefault(); - - var html = clipboardData.getData("text/html"); - var $node = $('<div/>').html(html); - // if copying source did not provide html, default to plain text - if(!html) { - $node.text(clipboardData.getData("text/plain")).html(function(_, html){ - return html.replace(/\r?\n/g,'<br>'); - }); - } - pasteContent($node, layoutInfo, $editable); - }; - - /* - remove undesirable tag - filter classes and style attributes - remove undesirable attributes - */ - var filter_tag = function ($nodes, $editable) { - return $nodes.each(function() { - var $node = $(this); - - if ($node.attr('style')) { - var style = _.filter(_.compact($node.attr('style').split(/\s*;\s*/)), function (style) { - style = style.split(/\s*:\s*/); - return /width|height|color|background-color|font-weight|text-align|font-style|text-decoration/i.test(style[0]) && - !(style[1] === 'initial' || style[1] === 'inherit' || $node.css(style[0]) === $editable.css(style[0]) || - (style[0] === 'background-color' && style[1] === 'rgb(255, 255, 255)') || - (style[0] === 'color' && style[1] === 'rgb(0, 0, 0)')); - }).join(';'); - if (style.length) { - $node.attr('style', style); - } else { - $node.removeAttr('style'); - } - } - - if ($node.attr('class')) { - var classes = _.filter($node.attr('class').split(/\s+/), function (style) { - return /(^|\s)(fa|pull|text|bg)(\s|-|$)/.test(style); - }).join(' '); - if (classes.length) { - $node.attr('class', classes); - } else { - $node.removeAttr('class'); - } - } - }); - }; - - var pasteContent = function ($node, layoutInfo, $editable) { - $node.find('meta, script, style').remove(); - filter_tag($node.find('*'), $editable).removeAttr('title', 'alt', 'id', 'contenteditable'); - - /* - remove unless span and unwant font - */ - $node.find('span, font').filter(':not([class]):not([style])').each(function () { - $(this).replaceWith($(this).contents()); - }); - $node.find('span + span').each(function () { - - if (dom.isText(this.previousSibling)) { - if (dom.isVisibleText(this.previousSibling)) { - return; - } else { // keep space between 2 tags, but can merge the both tags - $(this).prev().append(this.previousSibling); - } - } - if ($(this).attr('class') === $(this).prev().attr('class') && $(this).attr('style') === $(this).prev().attr('style')) { - $(this).prev().append($(this).contents()); - $(this).remove(); - } - }); - - // remove empty table row and td - var $tdr; - while(($tdr = $node.find('tr:empty, td:empty, th:empty, tbody:empty, t-head:empty, table:empty')) && $tdr.length) { - $tdr.remove(); - } - - /* - reset architecture HTML node and add <p> tag - */ - var $arch = $('<div/>'); - var $last = $arch; - $node.contents().each(function () { - if (dom.isBR(this)) { - $(this).remove(); - $last = $('<p/>'); - $arch.append($last); - } else if (/h[0-9]+|li|table|p/i.test(this.tagName)) { - $last = $('<p/>'); - $arch.append(this).append($last); - } else if ($arch.is(':empty') && dom.isText(this)) { - $last = $('<p/>').append(this); - $arch.append($last); - } else if (this.nodeType !== Node.COMMENT_NODE) { - $last.append(this); - } - }); - $arch.find(':not([class]):not([style]):empty, p:empty').remove(); - - /* - history - */ - $editable.data('NoteHistory').recordUndo($editable, "paste"); - - /* - remove selected content - */ - var r = range.create(); - if (!r.isCollapsed()) { - r = r.deleteContents(); - r.select(); - } - - // If only pasting a <p/> element in an unique <p/> element, only paste - // the <p/> element text - var $p = $arch.children('p'); - var onlyAP = ($p.length === 1 && $arch.children().length === 1); - if (onlyAP) { - var $p1 = $(r.sc).closest('p'); - var $p2 = $(r.ec).closest('p'); - if ($p1.length && $p2.length && $p1[0] === $p2[0]) { - $arch.html($p.text()); - } - } - - /* - insert content - */ - var $nodes = $(); - $editable.on('DOMNodeInserted', function (event) { - $nodes = $nodes.add(event.originalEvent.target); - }); - window.document.execCommand('insertHTML', false, $arch.html()); - $editable.off('DOMNodeInserted'); - - /* - clean insterted content - */ - var $span = $nodes.filter('span'); - $span = $span.first().add($span.last()); - $span = $span.add($span.prev('span')); - $span = $span.add($span.next('span')); - filter_tag($span, $editable); - $span.not('[span], [style]').each(function () { - _.each(this.childNodes, function (node) { - $(node.parentNode).after(node); - }); - $(this).remove(); - }); - r = range.create(); - if (!dom.isText(r.ec)) { - r = range.create(r.sc.childNodes[r.so], dom.nodeLength(r.sc.childNodes[r.so])); - } - r.clean().select(); - - $editable.trigger('content_changed'); + // ODOO override: use 0.8.10 version of this, adapted for the old summernote + // version odoo is using + var Clipboard = function (handler) { + /** + * paste by clipboard event + * + * @param {Event} event + */ + var pasteByEvent = function (event) { + if (["INPUT", "TEXTAREA"].indexOf(event.target.tagName) !== -1) { + // ODOO override: from old summernote version + return; + } + + var clipboardData = event.originalEvent.clipboardData; + var layoutInfo = dom.makeLayoutInfo(event.currentTarget || event.target); + var $editable = layoutInfo.editable(); + + if (clipboardData && clipboardData.items && clipboardData.items.length) { + var item = list.head(clipboardData.items); + if (item.kind === 'file' && item.type.indexOf('image/') !== -1) { + handler.insertImages(layoutInfo, [item.getAsFile()]); + } + handler.invoke('editor.afterCommand', $editable); + } + }; + + this.attach = function (layoutInfo) { + layoutInfo.editable().on('paste', pasteByEvent); + }; }; - }; - return Clipboard; + return Clipboard; }); diff --git a/addons/web_editor/static/src/js/backend/fields.js b/addons/web_editor/static/src/js/backend/fields.js index 479a26469a3..a636b7e5be3 100644 --- a/addons/web_editor/static/src/js/backend/fields.js +++ b/addons/web_editor/static/src/js/backend/fields.js @@ -163,7 +163,7 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend(TranslatableFieldMi if (fieldNameAttachment) { this.fieldNameAttachment = fieldNameAttachment; this.attachments = []; - summernoteConfig.onImageUpload = this._onImageUpload.bind(this); + summernoteConfig.onUpload = this._onUpload.bind(this); summernoteConfig.getMediaDomain = this._getAttachmentsDomain.bind(this); } @@ -195,7 +195,7 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend(TranslatableFieldMi * * @private */ - _onImageUpload: function (attachments) { + _onUpload: function (attachments) { var self = this; attachments = _.filter(attachments, function (attachment) { return !_.findWhere(self.attachments, {id: attachment.id}); diff --git a/addons/web_editor/static/src/js/editor/rte.js b/addons/web_editor/static/src/js/editor/rte.js index 44f69fc2026..b4a42f843c8 100644 --- a/addons/web_editor/static/src/js/editor/rte.js +++ b/addons/web_editor/static/src/js/editor/rte.js @@ -270,7 +270,13 @@ var RTEWidget = Widget.extend({ $.fn.carousel = this.edit_bootstrap_carousel; $(document).on('click.rte keyup.rte', function () { - var $popover = $((range.create()||{}).sc).closest('[contenteditable]'); + var current_range = {}; + try { + current_range = range.create() || {}; + } catch (e) { + // if range is on Restricted element ignore error + } + var $popover = $(current_range.sc).closest('[contenteditable]'); var popover_history = ($popover.data()||{}).NoteHistory; if (!popover_history || popover_history === history) return; var editor = $popover.parent('.note-editor'); diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js index 8d9d19be795..ce20c53ff49 100644 --- a/addons/web_editor/static/src/js/editor/rte.summernote.js +++ b/addons/web_editor/static/src/js/editor/rte.summernote.js @@ -403,7 +403,7 @@ eventHandler.modules.imageDialog.showImageDialog = function ($editable) { media: media, options: { lastFilters: ['background'], - onUpload: $editable.data('callbacks').onImageUpload, + onUpload: $editable.data('callbacks').onUpload, }, }); return new $.Deferred().reject(); @@ -689,7 +689,7 @@ function summernote_mousedown(event) { return; } var editables = $(".o_editable[contenteditable], .note-editable[contenteditable]"); - var r_editable = editables.has((r||{}).sc); + var r_editable = editables.has((r||{}).sc).addBack(editables.filter((r||{}).sc)); if (!r_editable.closest('.note-editor').is($editable) && !r_editable.filter('.o_editable').is(editables)) { var saved_editable = editables.has((remember_selection||{}).sc); if ($editable.length && !saved_editable.closest('.o_editable, .note-editor').is($editable)) { diff --git a/addons/web_editor/static/src/js/editor/transcoder.js b/addons/web_editor/static/src/js/editor/transcoder.js index 4fa30978f84..fb3e69eda29 100644 --- a/addons/web_editor/static/src/js/editor/transcoder.js +++ b/addons/web_editor/static/src/js/editor/transcoder.js @@ -227,6 +227,26 @@ function imgToFont($editable) { }); } +/* + * Utility function to apply function over descendants elements + * + * This is needed until the following issue of jQuery is solved: + * https://github.com./jquery/sizzle/issues/403 + * + * @param {Element} node The root Element node + * @param {Function} func The function applied over descendants + */ +function applyOverDescendants(node, func) { + node = node.firstChild; + while (node) { + if (node.nodeType === 1) { + func(node); + applyOverDescendants(node, func); + } + node = node.nextSibling; + } +} + /** * Converts css style to inline style (leave the classes on elements but forces * the style they give as inline style). @@ -237,9 +257,9 @@ function classToStyle($editable) { if (!rulesCache.length) { getMatchedCSSRules($editable[0]); } - $editable.find('*').each(function () { - var $target = $(this); - var css = getMatchedCSSRules(this); + applyOverDescendants($editable[0], function (node) { + var $target = $(node); + var css = getMatchedCSSRules(node); var style = $target.attr('style') || ''; _.each(css, function (v,k) { if (!(new RegExp('(^|;)\s*' + k).test(style))) { @@ -252,12 +272,12 @@ function classToStyle($editable) { $target.attr('style', style); } // Apple Mail - if (this.nodeName === 'TD' && !this.childNodes.length) { - this.innerHTML = ' '; + if (node.nodeName === 'TD' && !node.childNodes.length) { + node.innerHTML = ' '; } // Outlook - if (this.nodeName === 'A' && $target.hasClass('btn') && !$target.children().length) { + if (node.nodeName === 'A' && $target.hasClass('btn') && !$target.children().length) { var $hack = $('<table class="o_outlook_hack"><tr><td></td></tr></table>'); $hack.find('td') .attr('height', $target.outerHeight()) @@ -269,7 +289,7 @@ function classToStyle($editable) { $target.after($hack); $target.appendTo($hack.find('td')); // the space add a line when it's a table but it's invisible when it's a link - var node = $hack[0].previousSibling; + node = $hack[0].previousSibling; if (node && node.nodeType === Node.TEXT_NODE && !node.textContent.match(/\S/)) { $(node).remove(); } @@ -297,9 +317,9 @@ function styleToClass($editable) { var $c = $('<span/>').appendTo(document.body); - $editable.find('*').each(function () { - var $target = $(this); - var css = getMatchedCSSRules(this); + applyOverDescendants($editable[0], function (node) { + var $target = $(node); + var css = getMatchedCSSRules(node); var style = ''; _.each(css, function (v,k) { if (!(new RegExp('(^|;)\s*' + k).test(style))) { diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js index fc4892cfa64..5fd70d9cfee 100644 --- a/addons/web_editor/static/src/js/widgets/widgets.js +++ b/addons/web_editor/static/src/js/widgets/widgets.js @@ -381,13 +381,13 @@ var ImageWidget = MediaWidget.extend({ .sortBy(function (r) { if (_.any(self.firstFilters, function (filter) { var regex = new RegExp(filter, 'i'); - return r.name.match(regex) || r.datas_fname.match(regex); + return r.name.match(regex) || r.datas_fname && r.datas_fname.match(regex); })) { return -1; } if (_.any(self.lastFilters, function (filter) { var regex = new RegExp(filter, 'i'); - return r.name.match(regex) || r.datas_fname.match(regex); + return r.name.match(regex) || r.datas_fname && r.datas_fname.match(regex); })) { return 1; } |
