From f8b218ec5910ea26cce3f9f5edecf26e36181fe4 Mon Sep 17 00:00:00 2001 From: j Date: Fri, 21 Jul 2023 11:21:30 +0100 Subject: [PATCH 01/30] only post if target exists --- source/UI/js/Core/Event.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/UI/js/Core/Event.js b/source/UI/js/Core/Event.js index 8df1650a..31c1fee8 100644 --- a/source/UI/js/Core/Event.js +++ b/source/UI/js/Core/Event.js @@ -438,7 +438,7 @@ Ox.forEach( Ox.makeObject(Ox.slice(arguments)), function(data, event) { - target.postMessage(JSON.stringify({ + target && target.postMessage(JSON.stringify({ data: data, event: event, target: isParent ? Ox.oxid : null From 99ae1509cdb3604dd556898de0ecb31707ab51a4 Mon Sep 17 00:00:00 2001 From: j Date: Thu, 27 Jul 2023 16:54:38 +0200 Subject: [PATCH 02/30] some turkish translations --- source/Ox/js/Constants.js | 3 +- source/Ox/json/locale.tr.json | 89 +++++++++++ source/UI/json/locale.tr.json | 281 ++++++++++++++++++++++++++++++++++ 3 files changed, 372 insertions(+), 1 deletion(-) create mode 100644 source/Ox/json/locale.tr.json create mode 100644 source/UI/json/locale.tr.json diff --git a/source/Ox/js/Constants.js b/source/Ox/js/Constants.js index 8f88ca13..1fe2d45b 100644 --- a/source/Ox/js/Constants.js +++ b/source/Ox/js/Constants.js @@ -63,7 +63,8 @@ Ox.LOCALE_NAMES = { 'el': 'Ελληνικά', 'en': 'English', 'fr': 'Français', - 'hi': 'हिन्दी' + 'hi': 'हिन्दी', + 'tr': 'Türkçe' }; //@ Ox.LOCALES Locales per module Ox.LOCALES = {}; diff --git a/source/Ox/json/locale.tr.json b/source/Ox/json/locale.tr.json new file mode 100644 index 00000000..db589319 --- /dev/null +++ b/source/Ox/json/locale.tr.json @@ -0,0 +1,89 @@ +{ + "%": "%", + ",": ",", + ".": ".", + "%A, %B %e, %Y": "%A, %B %e, %Y", + "%a, %b %e, %Y": "%a, %b %e, %Y", + "AD": "", + "AM": "", + "Apr": "", + "April": "Nisan", + "Aug": "", + "August": "Ağustos", + "BC": "", + "%B %e, %Y": "", + "%b %e, %Y": "", + "d": "", + "day": "gün", + "days": "gün", + "days{2}": "gün", + "Dec": "", + "December": "Aralık", + "Fall": "Düşmek", + "Feb": "", + "February": "Şubat", + "Fri": "", + "Friday": "Cuma", + "h": "", + "hour": "saat", + "hours": "saat", + "hours{2}": "saat", + "%I:%M %p": "", + "%I:%M:%S %p": "", + "Jan": "", + "January": "Ocak", + "Jul": "", + "July": "Temmuz", + "Jun": "", + "June": "Haziran", + "m": "", + "Mar": "", + "March": "Mart", + "May": "Mayıs", + "%m/%d/%Y": "", + "%m/%d/%y": "", + "minute": "dakika", + "minutes": "dakika", + "minutes{2}": "dakika", + "Mon": "", + "Monday": "Pazartesi", + "nd": "", + "nd{22}": "", + "no": "", + "Nov": "", + "November": "Kasım", + "Oct": "", + "October": "Ekim", + "PM": "", + "rd": "", + "rd{23}": "", + "s": "", + "Sat": "", + "Saturday": "Cumartesi", + "second": "saniye", + "seconds": "saniye", + "seconds{2}": "saniye", + "Sep": "", + "September": "Eylül", + "Spring": "Bahar", + "st": "", + "st{21}": "", + "Summer": Yaz"", + "Sun": "", + "Sunday": "Pazar", + "th": "", + "th{11}": "", + "th{12}": "", + "th{13}": "", + "Thu": "", + "Thursday": "Perşembe", + "Tue": "", + "Tuesday": "", + "Wed": "", + "Wednesday": "Çarşamba", + "Winter": "kış", + "y": "", + "year": "yıl", + "years": "yıl", + "years{2}": "yıl" +} diff --git a/source/UI/json/locale.tr.json b/source/UI/json/locale.tr.json new file mode 100644 index 00000000..f5f82983 --- /dev/null +++ b/source/UI/json/locale.tr.json @@ -0,0 +1,281 @@ +{ + ", doubleclick to edit": ", düzenlemek için çift tıkla", + "Add": "Ekle", + "Add Files": "Dosya Ekle", + "Add Place": "Yer Ekle", + "Add a condition": "koşul ekle", + "Add a group of conditions": "", + "Add column after": "Sonrasına sütun ekle", + "Add column before": "", + "Add row above": "", + "Add row below": "", + "Add {0}": "", + "Adding...": "", + "All": "Tüm", + "Alternative Names": "", + "Area": "", + "At Current Position": "", + "Blockquote": "", + "Bold": "", + "Borough": "", + "Building": "", + "Bullets": "", + "By Duration": "", + "By Position": "", + "By Text": "", + "Cancel": "", + "Cancel/Deselect": "", + "Cancelled": "", + "City": "", + "Clear": "", + "Clear Event": "", + "Clear Place": "", + "Clearing...": "", + "Click to hide": "", + "Click to pan, doubleclick to zoom": "", + "Click to select": "", + "Click to select, doubleclick to edit": "", + "Click to show": "", + "Close": "", + "Complete": "", + "Country": "", + "Date": "", + "Date Created": "", + "Date Modified": "", + "Define": "", + "Define Event": "", + "Define Place": "", + "Delete Annotation": "", + "Deselect": "", + "Deselect Annotation": "", + "Don't Shuffle": "", + "Done": "", + "Download": "", + "Download Selection...": "", + "Download Video...": "", + "Drag to resize": "", + "Drag to resize or click to hide": "", + "Drag to resize or click to toggle map": "", + "Duration": "", + "East": "", + "Edit": "Düzenlemek", + "Edit Annotation": "", + "Edit/Submit": "", + "Editing Options": "", + "Embed Selection...": "", + "End": "", + "Enter Fullscreen": "", + "Event": "", + "Events": "", + "Examples...": "", + "Exit Fullscreen": "", + "Feature": "", + "Find": "", + "Find in All {0}": "", + "Find in List": "", + "Find in This {0}": "", + "Find on Map": "", + "Find...": "", + "Find: All": "", + "Find: Alternative Names": "", + "Find: Geoname": "", + "Find: Name": "", + "Flag": "", + "Font Size": "", + "Generating Documentation...": "", + "Geoname": "", + "Go One Frame Back": "", + "Go One Frame Forward": "", + "Go One Line Down": "", + "Go One Line Up": "", + "Go One Second Back": "", + "Go One Second Forward": "", + "Go to First Frame": "", + "Go to In Point": "", + "Go to Last Frame": "", + "Go to Next Annotation": "", + "Go to Next Cut": "", + "Go to Next Result": "", + "Go to Out Point": "", + "Go to Poster Frame": "", + "Go to Previous Annotation": "", + "Go to Previous Cut": "", + "Go to Previous Result": "", + "Headline": "", + "Hide": "", + "Hide Controls": "", + "Hide Labels": "", + "Home": "", + "Home Channel": "", + "Image": "", + "Import Annotations...": "", + "In Current Selection": "", + "Insert": "", + "Insert HTML": "", + "Insert...": "", + "Italic": "", + "Join Clip(s) at Cuts": "", + "Keyboard Shortcuts": "", + "Keyboard Shortcuts...": "", + "Large": "", + "Large Player": "", + "Larger": "", + "Latitude": "", + "Limit to": "", + "Linebreak": "", + "Link": "", + "List": "", + "Longitude": "", + "Make Clip(s) Static": "", + "Map Options": "", + "Match": "", + "Matches": "", + "Medium": "", + "Monospace": "", + "Mute": "", + "Mute/Unmute": "", + "Name": "", + "New Event": "", + "New Place": "", + "Next": "", + "Next Channel": "", + "Next Result": "", + "No file selected": "", + "No files selected": "", + "North": "", + "Numbers": "", + "Open in New Tab": "", + "Options": "", + "Other": "", + "Paragraph": "", + "Pause": "", + "Paused": "", + "Person": "", + "Place": "", + "Place or Event": "", + "Play": "", + "Play Current Track": "", + "Play In to Out": "", + "Play Next Track": "", + "Play/Pause": "", + "Previous": "", + "Previous Channel": "", + "Previous Result": "", + "Region": "", + "Reload": "", + "Remove": "", + "Remove Event": "", + "Remove File": "", + "Remove Place": "", + "Remove this column": "", + "Remove this condition": "", + "Remove this group of conditions": "", + "Remove this row": "", + "Removing...": "", + "Repeat All": "", + "Repeat None": "", + "Repeat One": "", + "Reset this condition": "", + "Resolution": "", + "Restart": "", + "Restore Defaults": "", + "Results": "", + "Resume": "", + "Right-to-Left": "", + "Run Tests": "", + "Save Changes": "", + "Save as Smart List": "", + "Scale to Fill": "", + "Scale to Fit": "", + "Scroll to Player": "", + "Select Current Annotation": "", + "Select Current Cut": "", + "Select File": "", + "Select Next Annotation": "", + "Select Previous Annotation": "", + "Set ": "", + "Set In Point": "", + "Set Out Point": "", + "Set Poster Frame": "", + "Settings": "", + "Show Annotations": "", + "Show Controls": "", + "Show Dates": "", + "Show Labels": "", + "Show Other": "", + "Show People": "", + "Show Places": "", + "Show Remaining Time": "", + "Show Subtitles": "", + "Show Users": "", + "Shuffle": "", + "Small": "", + "Small Player": "", + "Smaller": "", + "Sort Annotations": "", + "South": "", + "Split Clip(s) at Cuts": "", + "Start": "", + "Street": "", + "Strike": "", + "Subscript": "", + "Subtitles": "", + "Superscript": "", + "Switch Theme": "", + "Timeline": "", + "Title": "", + "Turn Volume Down": "", + "Turn Volume Up": "", + "Type": "", + "Underline": "", + "Undo Changes": "", + "Unmute": "", + "Untitled": "", + "User": "", + "Valid": "", + "View": "", + "View Live": "", + "View Source": "", + "View as Grid": "", + "View as List": "", + "Volume": "", + "West": "", + "add": "", + "all": "", + "and": "", + "annotations": "", + "any": "", + "ascending": "", + "bracket": "", + "contains": "", + "descending": "", + "does not contain": "", + "does not end with": "", + "does not start with": "", + "ends with": "", + "file": "", + "files": "", + "in": "", + "is": "", + "is after": "", + "is before": "", + "is between": "", + "is greater than": "", + "is less than": "", + "is not": "", + "is not after": "", + "is not before": "", + "is not between": "", + "is not greater than": "", + "is not less than": "", + "items": "", + "of the following conditions": "", + "order": "", + "sorted by": "", + "starts with": "", + "unknown": "", + "{0} Century": "", + "{0} Century BC": "", + "{0} Millennium": "", + "{0} Millennium BC": "" +} From 7ffb5b6b9e24b2fd479bb30fb0a1960613fe7b76 Mon Sep 17 00:00:00 2001 From: j Date: Fri, 4 Aug 2023 14:58:37 +0200 Subject: [PATCH 03/30] typo --- source/Ox/json/locale.tr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Ox/json/locale.tr.json b/source/Ox/json/locale.tr.json index db589319..2a9b1f0b 100644 --- a/source/Ox/json/locale.tr.json +++ b/source/Ox/json/locale.tr.json @@ -68,7 +68,7 @@ "Spring": "Bahar", "st": "", "st{21}": "", - "Summer": Yaz"", + "Summer": "Yaz", "Sun": "", "Sunday": "Pazar", "th": "", @@ -78,7 +78,7 @@ "Thu": "", "Thursday": "Perşembe", "Tue": "", - "Tuesday": "", + "Tuesday": "Salı", "Wed": "", "Wednesday": "Çarşamba", "Winter": "kış", From 7b3ae571033fcac867a53c693d0c54268021d247 Mon Sep 17 00:00:00 2001 From: j Date: Fri, 4 Aug 2023 17:46:25 +0200 Subject: [PATCH 04/30] update turkish translations --- source/Ox/json/locale.tr.json | 36 +-- source/UI/json/locale.tr.json | 542 +++++++++++++++++----------------- 2 files changed, 289 insertions(+), 289 deletions(-) diff --git a/source/Ox/json/locale.tr.json b/source/Ox/json/locale.tr.json index 2a9b1f0b..81c526bc 100644 --- a/source/Ox/json/locale.tr.json +++ b/source/Ox/json/locale.tr.json @@ -4,16 +4,16 @@ ".": ".", "%A, %B %e, %Y": "%A, %B %e, %Y", "%a, %b %e, %Y": "%a, %b %e, %Y", - "AD": "", + "AD": "MS", "AM": "", "Apr": "", "April": "Nisan", "Aug": "", "August": "Ağustos", - "BC": "", + "BC": "MÖ", "%B %e, %Y": "", "%b %e, %Y": "", - "d": "", + "d": "g", "day": "gün", "days": "gün", "days{2}": "gün", @@ -24,7 +24,7 @@ "February": "Şubat", "Fri": "", "Friday": "Cuma", - "h": "", + "h": "s", "hour": "saat", "hours": "saat", "hours{2}": "saat", @@ -36,7 +36,7 @@ "July": "Temmuz", "Jun": "", "June": "Haziran", - "m": "", + "m": "d", "Mar": "", "March": "Mart", "May": "Mayıs", @@ -47,17 +47,17 @@ "minutes{2}": "dakika", "Mon": "", "Monday": "Pazartesi", - "nd": "", - "nd{22}": "", - "no": "", + "nd": ".", + "nd{22}": ".", + "no": "hayır", "Nov": "", "November": "Kasım", "Oct": "", "October": "Ekim", "PM": "", - "rd": "", - "rd{23}": "", - "s": "", + "rd": ".", + "rd{23}": ".", + "s": "s", "Sat": "", "Saturday": "Cumartesi", "second": "saniye", @@ -66,15 +66,15 @@ "Sep": "", "September": "Eylül", "Spring": "Bahar", - "st": "", - "st{21}": "", + "st": ".", + "st{21}": ".", "Summer": "Yaz", "Sun": "", "Sunday": "Pazar", - "th": "", - "th{11}": "", - "th{12}": "", - "th{13}": "", + "th": ".", + "th{11}": ".", + "th{12}": ".", + "th{13}": ".", "Thu": "", "Thursday": "Perşembe", "Tue": "", @@ -82,7 +82,7 @@ "Wed": "", "Wednesday": "Çarşamba", "Winter": "kış", - "y": "", + "y": "yy", "year": "yıl", "years": "yıl", "years{2}": "yıl" diff --git a/source/UI/json/locale.tr.json b/source/UI/json/locale.tr.json index f5f82983..0aa7149b 100644 --- a/source/UI/json/locale.tr.json +++ b/source/UI/json/locale.tr.json @@ -4,278 +4,278 @@ "Add Files": "Dosya Ekle", "Add Place": "Yer Ekle", "Add a condition": "koşul ekle", - "Add a group of conditions": "", + "Add a group of conditions": "Bir grup koşul ekle", "Add column after": "Sonrasına sütun ekle", - "Add column before": "", - "Add row above": "", - "Add row below": "", - "Add {0}": "", - "Adding...": "", + "Add column before": "Önce sütun ekle", + "Add row above": "Üste satır ekle", + "Add row below": "Altına satır ekle", + "Add {0}": "{0} ekle", + "Adding...": "Ekleniyor..", "All": "Tüm", - "Alternative Names": "", - "Area": "", - "At Current Position": "", - "Blockquote": "", - "Bold": "", - "Borough": "", - "Building": "", - "Bullets": "", - "By Duration": "", - "By Position": "", - "By Text": "", - "Cancel": "", - "Cancel/Deselect": "", - "Cancelled": "", - "City": "", - "Clear": "", - "Clear Event": "", - "Clear Place": "", - "Clearing...": "", - "Click to hide": "", - "Click to pan, doubleclick to zoom": "", - "Click to select": "", - "Click to select, doubleclick to edit": "", - "Click to show": "", - "Close": "", - "Complete": "", - "Country": "", - "Date": "", - "Date Created": "", - "Date Modified": "", - "Define": "", - "Define Event": "", - "Define Place": "", - "Delete Annotation": "", - "Deselect": "", - "Deselect Annotation": "", - "Don't Shuffle": "", - "Done": "", - "Download": "", - "Download Selection...": "", - "Download Video...": "", - "Drag to resize": "", - "Drag to resize or click to hide": "", - "Drag to resize or click to toggle map": "", - "Duration": "", - "East": "", - "Edit": "Düzenlemek", - "Edit Annotation": "", - "Edit/Submit": "", - "Editing Options": "", - "Embed Selection...": "", - "End": "", - "Enter Fullscreen": "", - "Event": "", - "Events": "", - "Examples...": "", - "Exit Fullscreen": "", - "Feature": "", - "Find": "", - "Find in All {0}": "", - "Find in List": "", - "Find in This {0}": "", - "Find on Map": "", - "Find...": "", - "Find: All": "", - "Find: Alternative Names": "", - "Find: Geoname": "", - "Find: Name": "", - "Flag": "", - "Font Size": "", - "Generating Documentation...": "", - "Geoname": "", - "Go One Frame Back": "", - "Go One Frame Forward": "", - "Go One Line Down": "", - "Go One Line Up": "", - "Go One Second Back": "", - "Go One Second Forward": "", - "Go to First Frame": "", - "Go to In Point": "", - "Go to Last Frame": "", - "Go to Next Annotation": "", - "Go to Next Cut": "", - "Go to Next Result": "", - "Go to Out Point": "", - "Go to Poster Frame": "", - "Go to Previous Annotation": "", - "Go to Previous Cut": "", - "Go to Previous Result": "", - "Headline": "", - "Hide": "", - "Hide Controls": "", - "Hide Labels": "", - "Home": "", - "Home Channel": "", - "Image": "", - "Import Annotations...": "", - "In Current Selection": "", - "Insert": "", - "Insert HTML": "", - "Insert...": "", - "Italic": "", - "Join Clip(s) at Cuts": "", - "Keyboard Shortcuts": "", - "Keyboard Shortcuts...": "", - "Large": "", - "Large Player": "", - "Larger": "", - "Latitude": "", - "Limit to": "", - "Linebreak": "", - "Link": "", - "List": "", - "Longitude": "", - "Make Clip(s) Static": "", - "Map Options": "", - "Match": "", - "Matches": "", - "Medium": "", - "Monospace": "", - "Mute": "", - "Mute/Unmute": "", - "Name": "", - "New Event": "", - "New Place": "", - "Next": "", - "Next Channel": "", - "Next Result": "", - "No file selected": "", - "No files selected": "", - "North": "", - "Numbers": "", - "Open in New Tab": "", - "Options": "", - "Other": "", - "Paragraph": "", - "Pause": "", - "Paused": "", - "Person": "", - "Place": "", - "Place or Event": "", - "Play": "", - "Play Current Track": "", - "Play In to Out": "", - "Play Next Track": "", - "Play/Pause": "", - "Previous": "", - "Previous Channel": "", - "Previous Result": "", - "Region": "", - "Reload": "", - "Remove": "", - "Remove Event": "", - "Remove File": "", - "Remove Place": "", - "Remove this column": "", - "Remove this condition": "", - "Remove this group of conditions": "", - "Remove this row": "", - "Removing...": "", - "Repeat All": "", - "Repeat None": "", - "Repeat One": "", - "Reset this condition": "", - "Resolution": "", - "Restart": "", - "Restore Defaults": "", - "Results": "", - "Resume": "", - "Right-to-Left": "", - "Run Tests": "", - "Save Changes": "", - "Save as Smart List": "", - "Scale to Fill": "", - "Scale to Fit": "", - "Scroll to Player": "", - "Select Current Annotation": "", - "Select Current Cut": "", - "Select File": "", - "Select Next Annotation": "", - "Select Previous Annotation": "", - "Set ": "", - "Set In Point": "", - "Set Out Point": "", - "Set Poster Frame": "", - "Settings": "", - "Show Annotations": "", - "Show Controls": "", - "Show Dates": "", - "Show Labels": "", - "Show Other": "", - "Show People": "", - "Show Places": "", - "Show Remaining Time": "", - "Show Subtitles": "", - "Show Users": "", - "Shuffle": "", - "Small": "", - "Small Player": "", - "Smaller": "", - "Sort Annotations": "", - "South": "", - "Split Clip(s) at Cuts": "", - "Start": "", - "Street": "", - "Strike": "", - "Subscript": "", - "Subtitles": "", - "Superscript": "", - "Switch Theme": "", - "Timeline": "", - "Title": "", - "Turn Volume Down": "", - "Turn Volume Up": "", - "Type": "", - "Underline": "", - "Undo Changes": "", - "Unmute": "", - "Untitled": "", - "User": "", - "Valid": "", - "View": "", - "View Live": "", - "View Source": "", - "View as Grid": "", - "View as List": "", - "Volume": "", - "West": "", - "add": "", - "all": "", - "and": "", - "annotations": "", - "any": "", - "ascending": "", - "bracket": "", - "contains": "", - "descending": "", - "does not contain": "", - "does not end with": "", - "does not start with": "", - "ends with": "", - "file": "", - "files": "", - "in": "", + "Alternative Names": "Alternatif İsimler", + "Area": "Alan", + "At Current Position": "Mevcut Konumda", + "Blockquote": "Blok halinde alıntıla", + "Bold": "Kalın", + "Borough": "Mahalle", + "Building": "Bina", + "Bullets": "Madde İşaretleri", + "By Duration": "Süreye göre", + "By Position": "Pozisyona Göre", + "By Text": "Metne gore", + "Cancel": "İptal et", + "Cancel/Deselect": "İptal et/Seçimi kaldır", + "Cancelled": "İptal edildi", + "City": "Şehir", + "Clear": "Temizle", + "Clear Event": "Etkinliği temizle", + "Clear Place": "Yeri Temizle", + "Clearing...": "Temizleniyor", + "Click to hide": "gizlemek için tıklayın", + "Click to pan, doubleclick to zoom": "Kaydırmak için tıklayın, yakınlaştırmak için çift tıklayın", + "Click to select": "Seçmek için tıklayın", + "Click to select, doubleclick to edit": "Seçmek için tıklayın, düzenlemek için çift tıklayın", + "Click to show": "Göstermek için tıklayın", + "Close": "Kapat", + "Complete": "Tamamlandı", + "Country": "Ülke", + "Date": "Tarih", + "Date Created": "Oluşturulma Tarihi", + "Date Modified": "Değiştirilme Tarihi", + "Define": "Tanımla", + "Define Event": "Etkinlik Tanımla", + "Define Place": "Yer Tanımla", + "Delete Annotation": "Ek Açıklamayı Sil", + "Deselect": "Seçimi Kaldır", + "Deselect Annotation": "Ek Açıklamanın Seçimini Kaldır", + "Don't Shuffle": "Karıştırma", + "Done": "Bitti", + "Download": "İndir", + "Download Selection...": "Seçimi İndir...", + "Download Video...": "Video İndir", + "Drag to resize": "Yeniden boyutlandırmak için sürükleyin", + "Drag to resize or click to hide": "Yeniden boyutlandırmak için sürükleyin veya gizlemek için tıklayın", + "Drag to resize or click to toggle map": "eniden boyutlandırmak için sürükleyin veya haritayı değiştirmek için tıklayın", + "Duration": "Süre", + "East": "Doğu", + "Edit": "Kurgula", + "Edit Annotation": "Ek Açıklamayı Kurgula", + "Edit/Submit": "Kurgula/Gönder", + "Editing Options": "Kurgulama Seçenekleri", + "Embed Selection...": "Seçimi Yerleştir", + "End": "Son", + "Enter Fullscreen": "Tam Ekran Gir", + "Event": "Etkinlik", + "Events": "Etkinlikler", + "Examples...": "Örnekler...", + "Exit Fullscreen": "Tam Ekrandan Çık", + "Feature": "Özellik", + "Find": "Bul", + "Find in All {0}": "Tüm {0} İçinde Bul", + "Find in List": "Listede Bul", + "Find in This {0}": "Bu {0}'da Bul", + "Find on Map": "Haritada Bul", + "Find...": "Bul...", + "Find: All": "Bul: Tümü", + "Find: Alternative Names": "Bul: Alternatif İsimler", + "Find: Geoname": "Bul: Geoisim", + "Find: Name": "Bul: İsim", + "Flag": "Bayrak", + "Font Size": "Yazı Tipi Boyutu", + "Generating Documentation...": "Dokümantasyon Oluşturuyor...", + "Geoname": "Geo isim", + "Go One Frame Back": "Bir Kare Geri Git", + "Go One Frame Forward": "Bir Kare İleri Git", + "Go One Line Down": "Bir Satır Aşağı Git", + "Go One Line Up": "Bir Satır Yukarı Git", + "Go One Second Back": "Bir Saniye Geri Git", + "Go One Second Forward": "Bir Saniye İleriye Git", + "Go to First Frame": "İlk Kareye Git", + "Go to In Point": "Giriş Noktasına Git", + "Go to Last Frame": "Son Kareye Git", + "Go to Next Annotation": "Sonraki Açıklamaya Git", + "Go to Next Cut": "Sonraki Kesime Git", + "Go to Next Result": "Sonraki Sonuca Git", + "Go to Out Point": "Çıkış Noktasına Git", + "Go to Poster Frame": "Poster Çerçevesine Git", + "Go to Previous Annotation": "Önceki Ek Açıklamaya Git", + "Go to Previous Cut": "Önceki Kesmeye Git", + "Go to Previous Result": "Önceki Sonuca Git", + "Headline": "Başlık", + "Hide": "Sakla", + "Hide Controls": "Kontrolleri Gizle", + "Hide Labels": "Etiketleri Gizle", + "Home": "Ana Sayfa", + "Home Channel": "Ana Kanal", + "Image": "İmge", + "Import Annotations...": "Ek Açıklamaları İçe Aktar...", + "In Current Selection": "Mevcut Seçimde", + "Insert": "Ekle", + "Insert HTML": "HTML Ekle", + "Insert...": "Ekle...", + "Italic": "İtalik", + "Join Clip(s) at Cuts": "Klip(ler)i Kesimlerde Birleştir", + "Keyboard Shortcuts": "Klavye Kısayolları", + "Keyboard Shortcuts...": "Klavye Kısayolları...", + "Large": "Büyük", + "Large Player": "Büyük Oynatıcı", + "Larger": "Daha Büyük", + "Latitude": "Enlem", + "Limit to": "Sınırla", + "Linebreak": "Satır Sonu", + "Link": "Link", + "List": "Liste", + "Longitude": "Boylam", + "Make Clip(s) Static": "Klip(ler)i Statik Yap", + "Map Options": "Harita Seçenekleri", + "Match": "Eşleme", + "Matches": "Eşlemeler", + "Medium": "Orta", + "Monospace": "Monospace", + "Mute": "Sessiz", + "Mute/Unmute": "Sesi Kapat/Sesi Aç", + "Name": "İsim", + "New Event": "Yeni Etkinlik", + "New Place": "Yeni Yer", + "Next": "Sıradaki", + "Next Channel": "Yeni Kanal", + "Next Result": "Bir Sonraki Sonuç", + "No file selected": "Seçili dosya yok", + "No files selected": "Seçili dosya yok", + "North": "Kuzey", + "Numbers": "Sayılar", + "Open in New Tab": "Yeni Sekmede Aç", + "Options": "Seçenekler", + "Other": "Diğer", + "Paragraph": "Paragraf", + "Pause": "Durdur", + "Paused": "Durduruldu", + "Person": "Kişi", + "Place": "Yer", + "Place or Event": "Yer ya da Etkinlik", + "Play": "Oynat", + "Play Current Track": "Seçili Parçayı Çal", + "Play In to Out": "Giriş-Çıkış Arasında Oynat", + "Play Next Track": "Bir Sonraki Parçayı Çal", + "Play/Pause": "Başlat/Durdur", + "Previous": "Önceki", + "Previous Channel": "Önceki Kanal", + "Previous Result": "Önceki Sonuç", + "Region": "Bölge", + "Reload": "Yeniden Yükle", + "Remove": "Kaldır", + "Remove Event": "Etkinliği Kaldır", + "Remove File": "Dosyayı Kaldır", + "Remove Place": "Yeri Kaldır", + "Remove this column": "Bu sütunu kaldır", + "Remove this condition": "Bu koşulu kaldır", + "Remove this group of conditions": "Bu koşul grubunu kaldır ", + "Remove this row": "Bu satırı kaldır", + "Removing...": "Kaldırıyor...", + "Repeat All": "Hepsini Tekrarla", + "Repeat None": "Hiçbirini Tekrarlama", + "Repeat One": "Birini Tekrarla", + "Reset this condition": "Bu koşulu sıfırla", + "Resolution": "Çözünürlük", + "Restart": "Yeniden Başlat", + "Restore Defaults": "Varsayılanları Geri Yükle", + "Results": "Sonuçlar", + "Resume": "Devam Et", + "Right-to-Left": "Sağdan Sola", + "Run Tests": "Testleri Çalıştır", + "Save Changes": "Değişiklikleri Kaydet", + "Save as Smart List": "Akıllı Liste olarak Kaydet", + "Scale to Fill": "Doldurmak için Ölç", + "Scale to Fit": "Sığacak Şekilde Ölç", + "Scroll to Player": "Oyuncuya Kaydır", + "Select Current Annotation": "Geçerli Ek Açılamayı Seç", + "Select Current Cut": "Geçerli Kesimi Seç", + "Select File": "Dosya Seç", + "Select Next Annotation": "Sonraki Açıklamayı Seç", + "Select Previous Annotation": "Önceki Açıklamayı Seç", + "Set ": "Berlie", + "Set In Point": "Giriş Noktası Belirle", + "Set Out Point": "Çıkış Noktası Belirle", + "Set Poster Frame": "Poster Karesi Belirle", + "Settings": "Ayarlar", + "Show Annotations": "Ek Açıklamayı Göster", + "Show Controls": "Kontrol Çubuğunu Göster", + "Show Dates": "Tarihleri Göster", + "Show Labels": "Etiketleri Göster", + "Show Other": "Diğerini Göster", + "Show People": "İnsanları Göster", + "Show Places": "Yerleri Göster", + "Show Remaining Time": "Kalan Zamanı Göster", + "Show Subtitles": "Altyazıları Göster", + "Show Users": "Kullanıcıları Göster", + "Shuffle": "Karıştır", + "Small": "Küçük", + "Small Player": "Küçük Oynatıcı", + "Smaller": "Daha Küçük", + "Sort Annotations": "Ek Açıklamayı Düzenle", + "South": "Güney", + "Split Clip(s) at Cuts": "Klip(ler)i Kesimlerde Böl", + "Start": "Başlat", + "Street": "Sokak", + "Strike": "Üstünü Çiz", + "Subscript": "Alt Simge", + "Subtitles": "Altyazılar", + "Superscript": "Üst Simge", + "Switch Theme": "Temayı Değiştir", + "Timeline": "Zaman Çizelgesi", + "Title": "Başlık", + "Turn Volume Down": "Sesi Kıs", + "Turn Volume Up": "Sesi Aç", + "Type": "Tür", + "Underline": "Altını Çiz", + "Undo Changes": "Değişiklikleri Geri Al", + "Unmute": "Sesi Aç", + "Untitled": "İsimsiz", + "User": "Kullanıcı", + "Valid": "Geçerli", + "View": "Görüntüle", + "View Live": "Canlı Görüntüle", + "View Source": "Kaynağı Görüntüle", + "View as Grid": "Izgara Olarak Görüntüle" + "View as List": "Liste Olarak Görüntüle", + "Volume": "Ses Seviyesi", + "West": "Batı", + "add": "ekle", + "all": "hepsi", + "and": "ve", + "annotations": "ek açıklamalar", + "any": "herhangi", + "ascending": "artan", + "bracket": "parantez", + "contains": "içerir", + "descending": "azalan", + "does not contain": "içermez", + "does not end with": "ile bitmiyor", + "does not start with": "ile başlamaz", + "ends with": "ile biter", + "file": "dosya", + "files": "dosyalar", + "in": "içinde", "is": "", - "is after": "", - "is before": "", - "is between": "", - "is greater than": "", - "is less than": "", - "is not": "", - "is not after": "", - "is not before": "", - "is not between": "", - "is not greater than": "", - "is not less than": "", - "items": "", - "of the following conditions": "", - "order": "", - "sorted by": "", - "starts with": "", - "unknown": "", - "{0} Century": "", - "{0} Century BC": "", - "{0} Millennium": "", - "{0} Millennium BC": "" + "is after": "sonra", + "is before": "önce", + "is between": "arasında", + "is greater than": "'den büyüktür", + "is less than": "daha azdır", + "is not": "değil", + "is not after": "sonra değil", + "is not before": "önce değil", + "is not between": "arasında değil", + "is not greater than": "daha büyük değil", + "is not less than": "daha az değil", + "items": "öğeler", + "of the following conditions": "aşağıdaki koşullardan", + "order": "sırala", + "sorted by": "göre sırala", + "starts with": "ile başla", + "unknown": "bilinmiyor", + "{0} Century": "Yüzyıl", + "{0} Century BC": "Yüzyıl MÖ", + "{0} Millennium": "{0} Milenyum", + "{0} Millennium BC": "MÖ {0} Milenyum" } From b11dd36c7a7eee85f8fd245faef04202aa5240af Mon Sep 17 00:00:00 2001 From: j Date: Fri, 4 Aug 2023 17:48:11 +0200 Subject: [PATCH 05/30] typo --- source/UI/json/locale.tr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/UI/json/locale.tr.json b/source/UI/json/locale.tr.json index 0aa7149b..7f671f86 100644 --- a/source/UI/json/locale.tr.json +++ b/source/UI/json/locale.tr.json @@ -236,7 +236,7 @@ "View": "Görüntüle", "View Live": "Canlı Görüntüle", "View Source": "Kaynağı Görüntüle", - "View as Grid": "Izgara Olarak Görüntüle" + "View as Grid": "Izgara Olarak Görüntüle", "View as List": "Liste Olarak Görüntüle", "Volume": "Ses Seviyesi", "West": "Batı", From ac1a4ef961e6e2d4a6c383579fbd7d30c6345b8c Mon Sep 17 00:00:00 2001 From: j Date: Sun, 6 Aug 2023 11:49:55 +0200 Subject: [PATCH 06/30] avoid memory leak in jQuery.cache --- source/UI/js/Core/Element.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/UI/js/Core/Element.js b/source/UI/js/Core/Element.js index 5e1ca456..df17ea0b 100644 --- a/source/UI/js/Core/Element.js +++ b/source/UI/js/Core/Element.js @@ -710,6 +710,7 @@ Ox.Focus.removeElement(this.oxid); this.self(_).unbindKeyboard(); this.$tooltip && this.$tooltip.remove(); + jQuery.cleanData(this.$element); delete Ox.$elements[this.oxid]; // If setElement($element) was used, delete $element too delete Ox.$elements[this.$element.oxid]; @@ -738,6 +739,7 @@ this.findElements().forEach(function($element) { $element.removeElement(false); }); + jQuery.cleanData(this.$element); this.$element.replaceWith($element); if ($element.$element) { // $element is Ox.Element this.$element = $element.$element; From 49742b8b1ace90dd042de3a2e9e0532d32c51a8d Mon Sep 17 00:00:00 2001 From: j Date: Sun, 3 Sep 2023 11:24:01 +0100 Subject: [PATCH 07/30] Ox.FormPanel.values now accepts values too --- source/UI/js/Form/FormPanel.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/source/UI/js/Form/FormPanel.js b/source/UI/js/Form/FormPanel.js index b6b3409c..63755307 100644 --- a/source/UI/js/Form/FormPanel.js +++ b/source/UI/js/Form/FormPanel.js @@ -191,13 +191,24 @@ Ox.FormPanel = function(options, self) { values values @*/ that.values = function() { - var values = {}; - self.options.form.forEach(function(section, i) { - values[section.id] = self.$forms[i].values(); - }); - return values; + if (arguments.length === 0) { + var values = {}; + self.options.form.forEach(function(section, i) { + values[section.id] = self.$forms[i].values(); + }); + return values; + } else { + var sections = arguments[0]; + + self.options.form.forEach(function(form, i) { + if ((form.id in sections) { + self.$forms[i].values(sections[form.id]); + } + }); + } }; + return that; }; From 6252e27f6c2f75bdc55f3585b60f2d75220d6df7 Mon Sep 17 00:00:00 2001 From: j Date: Sun, 3 Sep 2023 11:44:49 +0100 Subject: [PATCH 08/30] Ox.FormPanel: support setting inital and updating selected panel --- source/UI/js/Form/FormPanel.js | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/source/UI/js/Form/FormPanel.js b/source/UI/js/Form/FormPanel.js index 63755307..ca9f22f2 100644 --- a/source/UI/js/Form/FormPanel.js +++ b/source/UI/js/Form/FormPanel.js @@ -15,11 +15,18 @@ Ox.FormPanel = function(options, self) { var that = Ox.Element({}, self) .defaults({ form: [], - listSize: 256 + listSize: 256, + section: null }) - .options(options || {}); + .options(options || {}) + .update({ + section: setSection + }); - self.section = 0; + if (self.options.section === null) { + self.options.section = self.options.form[0].id; + } + self.section = Ox.getIndexById(self.options.form, self.optoins.section); self.sectionTitle = self.options.form[self.section].title; self.$list = Ox.TableList({ columns: [ @@ -62,7 +69,7 @@ Ox.FormPanel = function(options, self) { }), max: 1, min: 1, - selected: [self.options.form[0].id], + selected: [self.options.selected], sort: [{key: 'id', operator: '+'}], unique: 'id', width: self.options.listSize @@ -130,7 +137,18 @@ Ox.FormPanel = function(options, self) { }); }); - self.$sections[0].show(); + self.$sections[self.section].show(); + + function setSection() { + var id = self.options.section, + section = Ox.getIndexById(self.options.form, id); + if (self.section != section) { + self.$sections[self.section].hide(); + self.section = section; + self.$list.options('selected', [id]); + self.$sections[self.section].show(); + } + }; that.setElement(Ox.SplitPanel({ elements: [ From fb6c862b88193d8b3b3a1ef364a225919f972b4c Mon Sep 17 00:00:00 2001 From: j Date: Sun, 3 Sep 2023 11:50:05 +0100 Subject: [PATCH 09/30] typo --- source/UI/js/Form/FormPanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/UI/js/Form/FormPanel.js b/source/UI/js/Form/FormPanel.js index ca9f22f2..5b3da686 100644 --- a/source/UI/js/Form/FormPanel.js +++ b/source/UI/js/Form/FormPanel.js @@ -26,7 +26,7 @@ Ox.FormPanel = function(options, self) { if (self.options.section === null) { self.options.section = self.options.form[0].id; } - self.section = Ox.getIndexById(self.options.form, self.optoins.section); + self.section = Ox.getIndexById(self.options.form, self.options.section); self.sectionTitle = self.options.form[self.section].title; self.$list = Ox.TableList({ columns: [ From 9a7c3144f591118e5495b991651b9129d646a745 Mon Sep 17 00:00:00 2001 From: j Date: Sun, 3 Sep 2023 12:11:12 +0100 Subject: [PATCH 10/30] fix FormPanel selections --- source/UI/js/Form/FormPanel.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source/UI/js/Form/FormPanel.js b/source/UI/js/Form/FormPanel.js index 5b3da686..2770599d 100644 --- a/source/UI/js/Form/FormPanel.js +++ b/source/UI/js/Form/FormPanel.js @@ -69,7 +69,7 @@ Ox.FormPanel = function(options, self) { }), max: 1, min: 1, - selected: [self.options.selected], + selected: [self.options.section], sort: [{key: 'id', operator: '+'}], unique: 'id', width: self.options.listSize @@ -77,6 +77,9 @@ Ox.FormPanel = function(options, self) { select: function(data) { self.$sections[self.section].hide(); self.section = Ox.getIndexById(self.options.form, data.ids[0]); + if (self.section == -1) { + self.section = 0 + } self.$sections[self.section].show(); that.triggerEvent('select', {section: data.ids[0]}); } @@ -142,7 +145,7 @@ Ox.FormPanel = function(options, self) { function setSection() { var id = self.options.section, section = Ox.getIndexById(self.options.form, id); - if (self.section != section) { + if (section > -1 && self.section != section) { self.$sections[self.section].hide(); self.section = section; self.$list.options('selected', [id]); @@ -219,7 +222,7 @@ Ox.FormPanel = function(options, self) { var sections = arguments[0]; self.options.form.forEach(function(form, i) { - if ((form.id in sections) { + if (form.id in sections) { self.$forms[i].values(sections[form.id]); } }); From 2a147446c26df12e8d157c4b7bedf6966753b7b1 Mon Sep 17 00:00:00 2001 From: j Date: Sun, 3 Sep 2023 12:15:05 +0100 Subject: [PATCH 11/30] Ox.formPanel: update options.section on interactive change --- source/UI/js/Form/FormPanel.js | 1 + 1 file changed, 1 insertion(+) diff --git a/source/UI/js/Form/FormPanel.js b/source/UI/js/Form/FormPanel.js index 2770599d..9eb7efe9 100644 --- a/source/UI/js/Form/FormPanel.js +++ b/source/UI/js/Form/FormPanel.js @@ -81,6 +81,7 @@ Ox.FormPanel = function(options, self) { self.section = 0 } self.$sections[self.section].show(); + self.options.section = self.options.form[self.section].id; that.triggerEvent('select', {section: data.ids[0]}); } }); From 2c4e0b8f7b53cadbdba3187ea62efc632247d4ec Mon Sep 17 00:00:00 2001 From: qsniyg Date: Mon, 4 Sep 2023 22:29:38 +0000 Subject: [PATCH 12/30] Use self.pageLength instead of self.options.pageLength in List::getPageByPosition self.options.pageLength is a hint, the actual pageLength can differ. For example when orientation == both, self.options.pageLength is disregarded entirely. --- source/UI/js/List/List.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/UI/js/List/List.js b/source/UI/js/List/List.js index b5421c02..0c0f9bb1 100644 --- a/source/UI/js/List/List.js +++ b/source/UI/js/List/List.js @@ -624,7 +624,7 @@ Ox.List = function(options, self) { } function getPageByPosition(pos) { - return Math.floor(pos / self.options.pageLength); + return Math.floor(pos / self.pageLength); } function getPageByScrollPosition(pos) { From d71ad7cad6b584c1798ed26a75e19122d78c2975 Mon Sep 17 00:00:00 2001 From: qsniyg Date: Mon, 4 Sep 2023 22:36:32 +0000 Subject: [PATCH 13/30] Allow setting multiple values for ButtonGroup --- source/UI/js/Form/ButtonGroup.js | 33 +++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/source/UI/js/Form/ButtonGroup.js b/source/UI/js/Form/ButtonGroup.js index c1c5ff5e..b4ff9ef1 100644 --- a/source/UI/js/Form/ButtonGroup.js +++ b/source/UI/js/Form/ButtonGroup.js @@ -31,18 +31,29 @@ Ox.ButtonGroup = function(options, self) { .options(options || {}) .update({ value: function() { - // fixme: this doesn't work in cases where - // multiple buttons can be selected - var position = Ox.getIndexById( - self.options.buttons, self.options.value - ); - if (position > -1) { - self.$buttons[position].trigger('click'); - } else if (self.options.min == 0) { - self.$buttons.forEach(function($button, i) { - $button.options('value') && $button.trigger('click'); - }); + var values = Ox.makeArray(self.options.value); + + var positions = []; + Ox.forEach(values, function(value) { + var position = Ox.getIndexById( + self.options.buttons, value + ); + + if (position > -1) { + positions.push(position); + } + }); + + if (positions.length < self.options.min) { + return; } + + Ox.forEach(self.$buttons, function(button, pos) { + var enabled = positions.indexOf(pos) > -1; + if (enabled !== button.value()) { + button.trigger('click'); + } + }); } }) .addClass( From d25fe788ee3d08ac1ef56c9dec8cca902dd17df5 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 7 Oct 2023 10:22:56 +0100 Subject: [PATCH 14/30] group vars into block (coding style) --- source/UI/js/Form/ButtonGroup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/UI/js/Form/ButtonGroup.js b/source/UI/js/Form/ButtonGroup.js index b4ff9ef1..d8eb06ab 100644 --- a/source/UI/js/Form/ButtonGroup.js +++ b/source/UI/js/Form/ButtonGroup.js @@ -31,9 +31,9 @@ Ox.ButtonGroup = function(options, self) { .options(options || {}) .update({ value: function() { - var values = Ox.makeArray(self.options.value); + var positions = [], + values = Ox.makeArray(self.options.value); - var positions = []; Ox.forEach(values, function(value) { var position = Ox.getIndexById( self.options.buttons, value From fc001a2f442bd94cbf76ae58d7275e195b1e8328 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 17 Feb 2024 14:15:34 +0000 Subject: [PATCH 15/30] version can contain dots --- source/Ox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Ox.js b/source/Ox.js index 16d1ce97..675fbed3 100644 --- a/source/Ox.js +++ b/source/Ox.js @@ -37,7 +37,7 @@ } function getPath() { - var index, regexp = /Ox\.js(\?\d+|)$/, + var index, regexp = /Ox\.js(\?[\d\.]+|)$/, scripts = document.getElementsByTagName('script'), src; for (index = scripts.length - 1; index >= 0; index--) { src = scripts[index].src; From 038ff06766cabd0db8fe23677915012e9d5d48bd Mon Sep 17 00:00:00 2001 From: j Date: Fri, 17 May 2024 16:38:44 +0200 Subject: [PATCH 16/30] balance subtitles --- source/UI/css/UI.css | 1 + 1 file changed, 1 insertion(+) diff --git a/source/UI/css/UI.css b/source/UI/css/UI.css index e6ea4dca..c13be065 100644 --- a/source/UI/css/UI.css +++ b/source/UI/css/UI.css @@ -2458,6 +2458,7 @@ Video font-size: 8px; line-height: 10px; text-align: center; + text-wrap: balance; text-overflow: ellipsis; text-shadow: rgba(0, 0, 0, 1) 1px 1px 1px; color: rgb(255, 255, 255); From a67b633bcf26180f6666e2f414fe34d0a1e0c2ab Mon Sep 17 00:00:00 2001 From: j Date: Sat, 1 Jun 2024 10:12:33 +0100 Subject: [PATCH 17/30] scrollbar-color breaks scrollbars on chrome --- source/UI/css/theme.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/UI/css/theme.css b/source/UI/css/theme.css index 5c62887e..91427838 100644 --- a/source/UI/css/theme.css +++ b/source/UI/css/theme.css @@ -1188,10 +1188,6 @@ Scrollbars background: -webkit-linear-gradient(left, $buttonActiveGradient); } -body.$themeClass { - scrollbar-color: $bodyBorder $bodyBackground; -} - /* ================================================================================ SourceViewer From f46a70d793794c0fad1ad1d85b460bb1ab801b66 Mon Sep 17 00:00:00 2001 From: j Date: Sun, 2 Jun 2024 16:29:11 +0100 Subject: [PATCH 18/30] re-enable scrollbar-color for non chrome browsers --- source/UI/css/theme.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/UI/css/theme.css b/source/UI/css/theme.css index 91427838..9f359b5e 100644 --- a/source/UI/css/theme.css +++ b/source/UI/css/theme.css @@ -1188,6 +1188,12 @@ Scrollbars background: -webkit-linear-gradient(left, $buttonActiveGradient); } +@supports not selector(::-webkit-scrollbar) { + -body.$themeClass { + scrollbar-color: $bodyBorder $bodyBackground; + } +} + /* ================================================================================ SourceViewer From 1a9fe95530467eb5add495607b6bf62cb225643f Mon Sep 17 00:00:00 2001 From: j Date: Sun, 2 Jun 2024 16:32:12 +0100 Subject: [PATCH 19/30] fix typo --- source/UI/css/theme.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/UI/css/theme.css b/source/UI/css/theme.css index 9f359b5e..83ac746d 100644 --- a/source/UI/css/theme.css +++ b/source/UI/css/theme.css @@ -1189,9 +1189,9 @@ Scrollbars } @supports not selector(::-webkit-scrollbar) { - -body.$themeClass { - scrollbar-color: $bodyBorder $bodyBackground; - } + body.$themeClass { + scrollbar-color: $bodyBorder $bodyBackground; + } } /* From 570fa30d4180a2070f6d03c8c1e2356da750832c Mon Sep 17 00:00:00 2001 From: j Date: Wed, 19 Jun 2024 13:52:52 +0200 Subject: [PATCH 20/30] fix "Find in" for annotations with quotes --- source/UI/js/Video/AnnotationPanel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/UI/js/Video/AnnotationPanel.js b/source/UI/js/Video/AnnotationPanel.js index e93ea671..7e03f779 100644 --- a/source/UI/js/Video/AnnotationPanel.js +++ b/source/UI/js/Video/AnnotationPanel.js @@ -325,9 +325,9 @@ Ox.AnnotationPanel = function(options, self) { } else if (data.id == 'export') { that.triggerEvent('exportannotations'); } else if (data.id == 'find') { - that.triggerEvent('find', {value: value}); + that.triggerEvent('find', {value: Ox.decodeHTMLEntities(value)}); } else if (data.id == 'findannotations') { - that.triggerEvent('findannotations', {key: key, value: value}); + that.triggerEvent('findannotations', {key: key, value: Ox.decodeHTMLEntities(value)}); } else if (data.id == 'import') { that.triggerEvent('importannotations'); } else if (data.id == 'insert') { From 168cdd691c5953cedc5dd67371c770ed89d5e5a3 Mon Sep 17 00:00:00 2001 From: j Date: Wed, 22 Jan 2025 11:57:37 +0530 Subject: [PATCH 21/30] disable overscroll behavior --- source/UI/css/UI.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/UI/css/UI.css b/source/UI/css/UI.css index c13be065..2b29ba4e 100644 --- a/source/UI/css/UI.css +++ b/source/UI/css/UI.css @@ -16,6 +16,9 @@ a:hover, .OxLink:hover { blockquote { margin: 0 1.5em 0 1.5em; } +html, body { + overscroll-behavior: none; +} body { margin: 0; cursor: default; From 96d4dfe71df0fc5616a4358d0764d663b475ea30 Mon Sep 17 00:00:00 2001 From: j Date: Wed, 22 Jan 2025 17:42:30 +0530 Subject: [PATCH 22/30] allow selecting multiple annotations to get in/out range --- source/UI/css/theme.css | 3 ++ source/UI/js/Form/ArrayEditable.js | 58 ++++++++++++++++++++-- source/UI/js/Video/VideoAnnotationPanel.js | 8 +++ 3 files changed, 65 insertions(+), 4 deletions(-) diff --git a/source/UI/css/theme.css b/source/UI/css/theme.css index 83ac746d..d0413cce 100644 --- a/source/UI/css/theme.css +++ b/source/UI/css/theme.css @@ -1398,6 +1398,9 @@ Video .$themeClass .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxEditable.OxSelected { background-color: $videoAnnotationEditableSelectedBackground; } +.$themeClass .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxEditable.OxSelected.OxMultiple { + background-color: $videoAnnotationSelectedBackground; +} .$themeClass .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxSelected .OxHighlight { background-color: transparent; background-image: -moz-repeating-linear-gradient( diff --git a/source/UI/js/Form/ArrayEditable.js b/source/UI/js/Form/ArrayEditable.js index f361569d..e5b2f802 100644 --- a/source/UI/js/Form/ArrayEditable.js +++ b/source/UI/js/Form/ArrayEditable.js @@ -146,12 +146,20 @@ Ox.ArrayEditable = function(options, self) { } } + function getId(position) { + return position > -1 ? self.options.items[position].id : ''; + } + function getSelectedId() { - return self.selected > -1 ? self.options.items[self.selected].id : ''; + return getId(self.selected); + } + + function getPosition(id) { + return Ox.getIndexById(self.options.items, id); } function getSelectedPosition() { - return Ox.getIndexById(self.options.items, self.options.selected); + return getPosition(self.options.selected); } function renderItems(blur) { @@ -267,6 +275,42 @@ Ox.ArrayEditable = function(options, self) { : that.triggerEvent('selectprevious'); } } + function toggleItem(idOrPosition) { + var id, position; + if (Ox.isString(idOrPosition)) { + id = idOrPosition + position = getPosition(id); + } else { + position = idOrPosition + id = getId(position); + } + if (!Ox.isArray(self.options.selected)) { + self.options.selected = [self.options.selected] + } + if (!Ox.isArray(self.selected)) { + self.selected = [self.selected] + } + if (self.options.selected.includes(id)) { + self.options.selected.pop(id) + self.selected.pop(position) + } else { + self.options.selected.push(id) + self.selected.push(position) + } + that.find('.OxSelected').removeClass('OxSelected').removeClass('OxMultiple'); + that.find('.OxGroup').removeClass('OxGroup') + if (self.options.selected.length == 1) { + self.options.selected = self.options.selected[0] + self.selected = self.selected[0] + self.$items[self.selected].addClass('OxSelected'); + self.options.highlightGroup && that.updateItemGroup() + } else { + Ox.forEach(self.selected, function(selected) { + self.$items[selected].addClass('OxSelected').addClass('OxMultiple'); + }) + } + triggerSelectEvent(); + } function selectItem(idOrPosition) { if (Ox.isString(idOrPosition)) { @@ -327,8 +371,14 @@ Ox.ArrayEditable = function(options, self) { position = $element.data('position'); // if clicked on an element if (position != self.selected) { - // select another item - selectItem(position); + if (e.shiftKey) { + // add/remove item from multiple selection + document.getSelection().removeAllRanges(); + toggleItem(position); + } else { + // select another item + selectItem(position); + } } else if (e.metaKey) { // or deselect current item selectNone(); diff --git a/source/UI/js/Video/VideoAnnotationPanel.js b/source/UI/js/Video/VideoAnnotationPanel.js index 5ce19326..c9c22801 100644 --- a/source/UI/js/Video/VideoAnnotationPanel.js +++ b/source/UI/js/Video/VideoAnnotationPanel.js @@ -1350,6 +1350,14 @@ Ox.VideoAnnotationPanel = function(options, self) { if (Ox.isUndefined(data)) { // doubleclick on small timeline data = getAnnotation(); + } else if (Ox.isArray(data.id)) { + var range = data.id.map(id => { + return Ox.getObjectById(self.annotations, id) + }) + data['in'] = Ox.min(range.map(annotation => { return annotation["in"]; })) + data['out'] = Ox.max(range.map(annotation => { return annotation["out"]; })) + setPoint('in', data['in'], true); + setPoint('out', data.out, true); } else if (!data.id && Ox.$elements[that.oxid]) { // focus only if in the dom that.gainFocus(); From 03eb3d4a569a4c23c0efe86e571f55e7d1484d1e Mon Sep 17 00:00:00 2001 From: j Date: Fri, 24 Jan 2025 17:10:36 +0530 Subject: [PATCH 23/30] select multple annotations, option to pass confirm delete dialog --- source/UI/js/Form/ArrayEditable.js | 55 ++++++++++++++-------- source/UI/js/Video/AnnotationFolder.js | 2 + source/UI/js/Video/AnnotationPanel.js | 2 + source/UI/js/Video/VideoAnnotationPanel.js | 2 + 4 files changed, 42 insertions(+), 19 deletions(-) diff --git a/source/UI/js/Form/ArrayEditable.js b/source/UI/js/Form/ArrayEditable.js index e5b2f802..7a1a0637 100644 --- a/source/UI/js/Form/ArrayEditable.js +++ b/source/UI/js/Form/ArrayEditable.js @@ -25,6 +25,7 @@ Ox.ArrayEditable = function(options, self) { var that = Ox.Element({}, self) .defaults({ clickLink: null, + confirmDeleteDialog: null, editable: true, format: null, getSortValue: null, @@ -120,19 +121,27 @@ Ox.ArrayEditable = function(options, self) { // it is possible to delete an (empty-value) item // by selecting another one id = id || self.options.selected; - var position = Ox.getIndexById(self.options.items, id) - if (self.options.editable) { - self.options.items.splice(position, 1); - renderItems(); - that.triggerEvent('delete', {id: id}); - self.editing = false; - if (self.options.selected == id) { - self.selected = -1; - self.options.selected = ''; - } else if (self.options.selected) { - self.selected = Ox.getIndexById(self.options.item, self.options.selected) + + (self.options.confirmDeleteDialog ? self.options.confirmDeleteDialog: Ox.noop)({ + items: Ox.isArray(id) ? id : [id], + }, function(result) { + if (self.options.editable) { + (Ox.isArray(id) ? id : [id]).forEach(id => { + var position = Ox.getIndexById(self.options.items, id) + self.options.items.splice(position, 1); + that.triggerEvent('delete', {id: id}); + }) + renderItems(); + self.editing = false; + if (self.options.selected == id) { + self.selected = -1; + self.options.selected = ''; + } else if (self.options.selected) { + self.selected = Ox.getIndexById(self.options.item, self.options.selected) + } } - } + }) + } function doubleclick(e) { @@ -290,12 +299,20 @@ Ox.ArrayEditable = function(options, self) { if (!Ox.isArray(self.selected)) { self.selected = [self.selected] } - if (self.options.selected.includes(id)) { - self.options.selected.pop(id) - self.selected.pop(position) - } else { - self.options.selected.push(id) - self.selected.push(position) + if (!self.options.selected.includes(id)) { + var minPos, maxPos; + if (Ox.min(self.selected) > position) { + minPos = position + maxPos = Ox.min(self.selected) + } else { + minPos = Ox.max(self.selected) + 1 + maxPos = position + 1 + } + Ox.range(minPos, maxPos).forEach(pos => { + self.selected.push(pos) + self.options.selected.push(getId(pos)) + }) + } that.find('.OxSelected').removeClass('OxSelected').removeClass('OxMultiple'); that.find('.OxGroup').removeClass('OxGroup') @@ -371,7 +388,7 @@ Ox.ArrayEditable = function(options, self) { position = $element.data('position'); // if clicked on an element if (position != self.selected) { - if (e.shiftKey) { + if (e.shiftKey && self.selected != -1) { // add/remove item from multiple selection document.getSelection().removeAllRanges(); toggleItem(position); diff --git a/source/UI/js/Video/AnnotationFolder.js b/source/UI/js/Video/AnnotationFolder.js index 4b04dcd4..5439ebed 100644 --- a/source/UI/js/Video/AnnotationFolder.js +++ b/source/UI/js/Video/AnnotationFolder.js @@ -35,6 +35,7 @@ Ox.AnnotationFolder = function(options, self) { var that = Ox.Element({}, self) .defaults({ clickLink: null, + confirmDeleteDialog: null, collapsed: false, editable: false, highlight: '', @@ -281,6 +282,7 @@ Ox.AnnotationFolder = function(options, self) { } self.$annotations = Ox.ArrayEditable(Ox.extend({ clickLink: self.options.clickLink, + confirmDeleteDialog: self.options.confirmDeleteDialog, editable: self.options.editable, getSortValue: self.options.type == 'text' ? function(value) { diff --git a/source/UI/js/Video/AnnotationPanel.js b/source/UI/js/Video/AnnotationPanel.js index 7e03f779..5f81c56a 100644 --- a/source/UI/js/Video/AnnotationPanel.js +++ b/source/UI/js/Video/AnnotationPanel.js @@ -48,6 +48,7 @@ Ox.AnnotationPanel = function(options, self) { .defaults({ calendarSize: 256, clickLink: null, + confirmDeleteDialog: null, editable: false, enableExport: false, enableImport: false, @@ -371,6 +372,7 @@ Ox.AnnotationPanel = function(options, self) { self.$folder[index] = Ox.AnnotationFolder( Ox.extend({ clickLink: self.options.clickLink, + confirmDeleteDialog: self.options.confirmDeleteDialog, collapsed: !self.options.showLayers[layer.id], editable: self.options.editable, highlight: getHighlight(layer.id), diff --git a/source/UI/js/Video/VideoAnnotationPanel.js b/source/UI/js/Video/VideoAnnotationPanel.js index c9c22801..08585a7c 100644 --- a/source/UI/js/Video/VideoAnnotationPanel.js +++ b/source/UI/js/Video/VideoAnnotationPanel.js @@ -61,6 +61,7 @@ Ox.VideoAnnotationPanel = function(options, self) { censoredIcon: '', censoredTooltip: '', clickLink: null, + confirmDeleteDialog: null, cuts: [], duration: 0, enableDownload: false, @@ -844,6 +845,7 @@ Ox.VideoAnnotationPanel = function(options, self) { autocomplete: self.options.autocomplete, calendarSize: self.options.annotationsCalendarSize, clickLink: self.options.clickLink, + confirmDeleteDialog: self.options.confirmDeleteDialog, editable: true, enableExport: self.options.enableExport, enableImport: self.options.enableImport, From 6341e64a649794bdf01ba616230e897abe208f56 Mon Sep 17 00:00:00 2001 From: j Date: Fri, 24 Jan 2025 16:23:19 +0530 Subject: [PATCH 24/30] add transcribe option --- source/UI/js/Video/AnnotationPanel.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source/UI/js/Video/AnnotationPanel.js b/source/UI/js/Video/AnnotationPanel.js index 5f81c56a..1677697f 100644 --- a/source/UI/js/Video/AnnotationPanel.js +++ b/source/UI/js/Video/AnnotationPanel.js @@ -52,6 +52,7 @@ Ox.AnnotationPanel = function(options, self) { editable: false, enableExport: false, enableImport: false, + enableTranscribe: false, highlight: '', highlightAnnotations: 'none', highlightLayer: '*', @@ -304,7 +305,11 @@ Ox.AnnotationPanel = function(options, self) { {}, {id: 'import', title: Ox._('Import Annotations...'), disabled: !self.options.enableImport}, {id: 'export', title: Ox._('Export Annotations...'), disabled: !self.options.enableExport}, - ] + ].concat( + self.options.enableTranscribe ? [ + {id: 'transcribe', title: Ox._('Transcribe Audio...')}, + ]: [] + ) ), maxWidth: 256, style: 'square', @@ -352,6 +357,8 @@ Ox.AnnotationPanel = function(options, self) { // ... } else if (data.id == 'showentityinfo') { that.triggerEvent('showentityinfo', annotation.entity); + } else if (data.id == 'transcribe') { + that.triggerEvent('transcribe'); } else if (data.id == 'undo') { // ... } From 4cde39b1825e91f62236dff3fc5fdb159c41bf6a Mon Sep 17 00:00:00 2001 From: j Date: Fri, 24 Jan 2025 19:59:56 +0530 Subject: [PATCH 25/30] hook up transcribe option --- source/UI/js/Video/AnnotationPanel.js | 6 +++--- source/UI/js/Video/VideoAnnotationPanel.js | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/source/UI/js/Video/AnnotationPanel.js b/source/UI/js/Video/AnnotationPanel.js index 1677697f..658dc9f4 100644 --- a/source/UI/js/Video/AnnotationPanel.js +++ b/source/UI/js/Video/AnnotationPanel.js @@ -307,7 +307,7 @@ Ox.AnnotationPanel = function(options, self) { {id: 'export', title: Ox._('Export Annotations...'), disabled: !self.options.enableExport}, ].concat( self.options.enableTranscribe ? [ - {id: 'transcribe', title: Ox._('Transcribe Audio...')}, + {id: 'transcribeaudio', title: Ox._('Transcribe Audio...')}, ]: [] ) ), @@ -357,8 +357,8 @@ Ox.AnnotationPanel = function(options, self) { // ... } else if (data.id == 'showentityinfo') { that.triggerEvent('showentityinfo', annotation.entity); - } else if (data.id == 'transcribe') { - that.triggerEvent('transcribe'); + } else if (data.id == 'transcribeaudio') { + that.triggerEvent('transcribeaudio'); } else if (data.id == 'undo') { // ... } diff --git a/source/UI/js/Video/VideoAnnotationPanel.js b/source/UI/js/Video/VideoAnnotationPanel.js index 08585a7c..64e00a7c 100644 --- a/source/UI/js/Video/VideoAnnotationPanel.js +++ b/source/UI/js/Video/VideoAnnotationPanel.js @@ -67,6 +67,7 @@ Ox.VideoAnnotationPanel = function(options, self) { enableDownload: false, enableImport: false, enableExport: false, + enableTranscribe: false, enableSetPosterFrame: false, enableSubtitles: false, find: '', @@ -849,6 +850,7 @@ Ox.VideoAnnotationPanel = function(options, self) { editable: true, enableExport: self.options.enableExport, enableImport: self.options.enableImport, + enableTranscribe: self.options.enableTranscribe, highlight: self.options.find, highlightAnnotations: self.options.annotationsHighlight, highlightLayer: self.options.findLayer, @@ -951,6 +953,9 @@ Ox.VideoAnnotationPanel = function(options, self) { that.triggerEvent('showentityinfo', data); }, submit: submitAnnotation, + transcribeaudio: function() { + that.triggerEvent('transcribeaudio'); + }, toggle: toggleAnnotations, togglecalendar: function(data) { self.options.showAnnotationsCalendar = !data.collapsed; From 8e760c3959aa7dadac8683d88c3a065205460173 Mon Sep 17 00:00:00 2001 From: j Date: Fri, 24 Jan 2025 23:31:51 +0530 Subject: [PATCH 26/30] no special color for multiple --- source/UI/css/theme.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/UI/css/theme.css b/source/UI/css/theme.css index d0413cce..83ac746d 100644 --- a/source/UI/css/theme.css +++ b/source/UI/css/theme.css @@ -1398,9 +1398,6 @@ Video .$themeClass .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxEditable.OxSelected { background-color: $videoAnnotationEditableSelectedBackground; } -.$themeClass .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxEditable.OxSelected.OxMultiple { - background-color: $videoAnnotationSelectedBackground; -} .$themeClass .OxAnnotationFolder .OxArrayEditable .OxEditableElement.OxSelected .OxHighlight { background-color: transparent; background-image: -moz-repeating-linear-gradient( From 01596fa174e8772790214237069ee510f3b4318c Mon Sep 17 00:00:00 2001 From: j Date: Sat, 25 Jan 2025 10:27:45 +0530 Subject: [PATCH 27/30] fix multiple id selection in VideoAnnotationPanel chain --- source/UI/js/Video/AnnotationFolder.js | 50 ++++++++++++++-------- source/UI/js/Video/VideoAnnotationPanel.js | 8 ---- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/source/UI/js/Video/AnnotationFolder.js b/source/UI/js/Video/AnnotationFolder.js index 5439ebed..2284f36d 100644 --- a/source/UI/js/Video/AnnotationFolder.js +++ b/source/UI/js/Video/AnnotationFolder.js @@ -581,26 +581,40 @@ Ox.AnnotationFolder = function(options, self) { function selectAnnotation(data) { if (self.loaded) { - var item = Ox.getObjectById(self.options.items, data.id); - self.options.selected = item ? data.id : ''; - if (self.widget) { - if (self.options.type == 'event') { - self.$calendar.options({ - selected: item && isDefined(item) ? item.event.id : '' - }) - .panToEvent(); - } else { - self.$map.options({ - selected: item && isDefined(item) ? item.place.id : '' - }) - .panToPlace(); + var extendedData; + if (Ox.isArray(data.id) && data.id.length) { + var items = data.id.map(id => { + return Ox.getObjectById(self.options.items, id); + }) + self.options.selected = data.id; + extendedData = Ox.extend(data, { + 'in': Ox.min(items.map(item => { return item["in"]; })), + out: Ox.max(items.map(item => { return item["out"]; })), + layer: self.options.id + }); + } else { + var item = Ox.getObjectById(self.options.items, data.id) + self.options.selected = item ? data.id : ''; + if (self.widget) { + if (self.options.type == 'event') { + self.$calendar.options({ + selected: item && isDefined(item) ? item.event.id : '' + }) + .panToEvent(); + } else { + self.$map.options({ + selected: item && isDefined(item) ? item.place.id : '' + }) + .panToPlace(); + } } + extendedData = Ox.extend(data, item ? { + 'in': item['in'], + out: item.out, + layer: self.options.id + } : {}); } - that.triggerEvent('select', Ox.extend(data, item ? { - 'in': item['in'], - out: item.out, - layer: self.options.id - } : {})); + that.triggerEvent('select', extendedData) } } diff --git a/source/UI/js/Video/VideoAnnotationPanel.js b/source/UI/js/Video/VideoAnnotationPanel.js index 64e00a7c..3d52533a 100644 --- a/source/UI/js/Video/VideoAnnotationPanel.js +++ b/source/UI/js/Video/VideoAnnotationPanel.js @@ -1357,14 +1357,6 @@ Ox.VideoAnnotationPanel = function(options, self) { if (Ox.isUndefined(data)) { // doubleclick on small timeline data = getAnnotation(); - } else if (Ox.isArray(data.id)) { - var range = data.id.map(id => { - return Ox.getObjectById(self.annotations, id) - }) - data['in'] = Ox.min(range.map(annotation => { return annotation["in"]; })) - data['out'] = Ox.max(range.map(annotation => { return annotation["out"]; })) - setPoint('in', data['in'], true); - setPoint('out', data.out, true); } else if (!data.id && Ox.$elements[that.oxid]) { // focus only if in the dom that.gainFocus(); From 6e1e2be9c41dd75e9acfc5acaf300327b3944b19 Mon Sep 17 00:00:00 2001 From: j Date: Thu, 30 Jan 2025 16:59:35 +0530 Subject: [PATCH 28/30] no confirmation dialog for empty annotations --- source/UI/js/Form/ArrayEditable.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/UI/js/Form/ArrayEditable.js b/source/UI/js/Form/ArrayEditable.js index 7a1a0637..11f62ff9 100644 --- a/source/UI/js/Form/ArrayEditable.js +++ b/source/UI/js/Form/ArrayEditable.js @@ -117,12 +117,12 @@ Ox.ArrayEditable = function(options, self) { self.selected = getSelectedPosition(); - function deleteItem(id) { + function deleteItem(id, empty) { // it is possible to delete an (empty-value) item // by selecting another one id = id || self.options.selected; - (self.options.confirmDeleteDialog ? self.options.confirmDeleteDialog: Ox.noop)({ + (self.options.confirmDeleteDialog && !empty ? self.options.confirmDeleteDialog: Ox.noop)({ items: Ox.isArray(id) ? id : [id], }, function(result) { if (self.options.editable) { @@ -437,7 +437,7 @@ Ox.ArrayEditable = function(options, self) { var item = Ox.getObjectById(self.options.items, id); Ox.Log('AE', 'submitItem', id, item) if (value === '') { - deleteItem(item.id); + deleteItem(item.id, true); } else { that.triggerEvent(item.value === value ? 'blur' : 'submit', { id: item.id, From f8e48f54ca8d0e0abce1cf14e7097e7fd3fe5020 Mon Sep 17 00:00:00 2001 From: j Date: Sun, 6 Jul 2025 20:23:54 +0100 Subject: [PATCH 29/30] expose async flag to disable it for window.unload events --- source/UI/js/Core/Request.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/UI/js/Core/Request.js b/source/UI/js/Core/Request.js index cadc6e5a..b5980252 100644 --- a/source/UI/js/Core/Request.js +++ b/source/UI/js/Core/Request.js @@ -25,6 +25,7 @@ Ox.Request = (function() { $element; return { + async: true, /*@ bindEvent Bind event @@ -139,6 +140,7 @@ Ox.Request = (function() { } else { pending[req] = true; $.ajax({ + async: Ox.Request.async, beforeSend: function(request) { var csrftoken = Ox.Cookies('csrftoken'); if (csrftoken) { From 33a7832d64ebe6f8e10797a114406c43e0727edf Mon Sep 17 00:00:00 2001 From: j Date: Tue, 5 Aug 2025 15:22:21 +0200 Subject: [PATCH 30/30] raw regexp --- tools/build/build.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/build/build.py b/tools/build/build.py index 8accbd3d..ec3cc568 100755 --- a/tools/build/build.py +++ b/tools/build/build.py @@ -80,13 +80,13 @@ def build_oxjs(downloads=False, geo=False): path = source_path + 'UI/svg/' for filename in [filename for filename in os.listdir(path) if not filename[0] in '._']: svg = read_text(path + filename) - svg = re.sub('\n\s*', '', svg) - svg = re.sub('', '', svg) + svg = re.sub(r'\n\s*', '', svg) + svg = re.sub(r'', '', svg) # end fix ui_images[filename[:-4]] = svg if filename.startswith('symbolLoading'): for theme in themes: - theme_svg = re.sub('#808080', format_hex(theme_data[theme]['symbolDefaultColor']), svg) + theme_svg = re.sub(r'#808080', format_hex(theme_data[theme]['symbolDefaultColor']), svg) write_file('%sUI/themes/%s/svg/%s' % (dev_path, theme, filename), theme_svg) write_file('%sUI/themes/%s/svg/%s' % (min_path, theme, filename), theme_svg) @@ -101,10 +101,10 @@ def build_oxjs(downloads=False, geo=False): and (geo or '/Geo/' not in path): # write copies in min path source = os.path.join(path, filename) - is_jquery = re.search('^jquery-[\d\.]+\.js$', filename) - is_jquery_min = re.search('^jquery-[\d\.]+\.min\.js$', filename) - is_jquery_plugin = re.search('^jquery\..*?\.js$', filename) - is_jsonc = re.search('\.jsonc$', filename) + is_jquery = re.search(r'^jquery-[\d\.]+\.js$', filename) + is_jquery_min = re.search(r'^jquery-[\d\.]+\.min\.js$', filename) + is_jquery_plugin = re.search(r'^jquery\..*?\.js$', filename) + is_jsonc = re.search(r'\.jsonc$', filename) if is_jquery or is_jquery_min: target = os.path.join(path.replace(source_path, min_path), 'jquery.js') else: @@ -113,7 +113,7 @@ def build_oxjs(downloads=False, geo=False): ui_files['dev'].append(target.replace(min_path, '')) ui_files['min'].append(target.replace(min_path, '')) if '/Ox/js/' not in source and '/UI/js/' not in source and not is_jquery: - if re.match('^Ox\..+\.js$', filename) or is_jsonc: + if re.match(r'^Ox\..+\.js$', filename) or is_jsonc: js = read_text(source) print('minifiy and write', filename, target) write_file(target, ox.js.minify(js, '' if is_jsonc else comment)) @@ -129,7 +129,7 @@ def build_oxjs(downloads=False, geo=False): if not is_jquery_min: write_link(link_source, link_target) # locales - match = re.search('/(\w+)/json/locale.(\w+).json', source) + match = re.search(r'/(\w+)/json/locale.(\w+).json', source) if match: module = match.group(1) locale = match.group(2) @@ -182,12 +182,12 @@ def build_oxjs(downloads=False, geo=False): if not js_dir + filename in sum(ox_files, []): ox_files[-1].append(js_dir + filename) js = re.sub( - 'Ox.LOCALES = \{\}', + r'Ox.LOCALES = \{\}', 'Ox.LOCALES = ' + json.dumps(locales, indent=4, sort_keys=True), js ) js = re.sub( - "Ox.VERSION = '([\d\.]+)'", + r"Ox.VERSION = '([\d\.]+)'", "Ox.VERSION = '%s'" % version, js ) @@ -238,7 +238,7 @@ def build_oxjs(downloads=False, geo=False): data = { # sum(list, []) is flatten 'documentation': sorted(sum(ox_files, [])) + sorted(list(filter( - lambda x: re.search('\.js$', x), + lambda x: re.search(r'\.js$', x), ui_files['dev'] )) + ['%s/%s.js' % (x, x) for x in ['Geo', 'Image', 'Unicode']]), 'examples': sorted(sum(map( @@ -250,7 +250,7 @@ def build_oxjs(downloads=False, geo=False): ) )), list(filter( - lambda x: not re.search('^[._]', x), + lambda x: not re.search(r'^[._]', x), os.listdir(root_path + 'examples/') )) ), [])) if os.path.exists(root_path + 'examples/') else (), @@ -264,7 +264,7 @@ def build_oxjs(downloads=False, geo=False): 'title': get_title(root_path + 'readme/' + x) }, filter( - lambda x: not re.search('^[._]', x) and re.search('\.html$', x), + lambda x: not re.search(r'^[._]', x) and re.search(r'\.html$', x), os.listdir(root_path + 'readme/') ) )) @@ -355,7 +355,7 @@ def parse_css(css, values): ) for vals in value] ) return string - return re.sub('\$(\w+)(\[\d+\])?', sub, css) + return re.sub(r'\$(\w+)(\[\d+\])?', sub, css) def read_file(file): print('reading', file)