Commit 6deba183 authored by CardBook's avatar CardBook

version 34.5

parent 1a3384fa
...@@ -26,13 +26,19 @@ if ("undefined" == typeof(wdw_addressbooksAdd)) { ...@@ -26,13 +26,19 @@ if ("undefined" == typeof(wdw_addressbooksAdd)) {
lTimerDiscoveryAll : {}, lTimerDiscoveryAll : {},
initSearchDefinition: function () { initSearchDefinition: function () {
if (cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId]) { if (cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId] && cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId].searchAB) {
wdw_addressbooksAdd.gSearchDefinition['searchAB'] = cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId].searchAB; wdw_addressbooksAdd.gSearchDefinition['searchAB'] = cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId].searchAB;
wdw_addressbooksAdd.gSearchDefinition['matchAll'] = cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId].matchAll;
wdw_addressbooksAdd.gSearchDefinition['rules'] = JSON.parse(JSON.stringify(cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId].rules));
} else { } else {
wdw_addressbooksAdd.gSearchDefinition['searchAB'] = true; wdw_addressbooksAdd.gSearchDefinition['searchAB'] = true;
}
if (cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId] && cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId].matchAll) {
wdw_addressbooksAdd.gSearchDefinition['matchAll'] = cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId].matchAll;
} else {
wdw_addressbooksAdd.gSearchDefinition['matchAll'] = 'and'; wdw_addressbooksAdd.gSearchDefinition['matchAll'] = 'and';
}
if (cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId] && cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId].rules) {
wdw_addressbooksAdd.gSearchDefinition['rules'] = JSON.parse(JSON.stringify(cardbookRepository.cardbookComplexSearch[window.arguments[0].dirPrefId].rules));
} else {
wdw_addressbooksAdd.gSearchDefinition['rules'] = [["","","",""]]; wdw_addressbooksAdd.gSearchDefinition['rules'] = [["","","",""]];
} }
}, },
......
...@@ -271,6 +271,9 @@ if ("undefined" == typeof(cardbookComplexSearch)) { ...@@ -271,6 +271,9 @@ if ("undefined" == typeof(cardbookComplexSearch)) {
if (aData != null && aData !== undefined && aData != "") { if (aData != null && aData !== undefined && aData != "") {
cardbookRepository.cardbookComplexSearch[aDirPrefId] = {} cardbookRepository.cardbookComplexSearch[aDirPrefId] = {}
var relative = aData.match("^searchAB:([^:]*):searchAll:([^:]*)(.*)"); var relative = aData.match("^searchAB:([^:]*):searchAll:([^:]*)(.*)");
if (!relative) {
return;
}
cardbookRepository.cardbookComplexSearch[aDirPrefId].searchAB = relative[1]; cardbookRepository.cardbookComplexSearch[aDirPrefId].searchAB = relative[1];
if (relative[2] == "true") { if (relative[2] == "true") {
cardbookRepository.cardbookComplexSearch[aDirPrefId].matchAll = true; cardbookRepository.cardbookComplexSearch[aDirPrefId].matchAll = true;
......
...@@ -101,7 +101,7 @@ if ("undefined" == typeof(ovl_synchro)) { ...@@ -101,7 +101,7 @@ if ("undefined" == typeof(ovl_synchro)) {
prefs.setCharPref("accountsShown", "all"); prefs.setCharPref("accountsShown", "all");
prefs.setCharPref("accountShown", ""); prefs.setCharPref("accountShown", "");
prefs.setCharPref("uncategorizedCards", ""); prefs.setCharPref("uncategorizedCards", "");
prefs.setCharPref("addonVersion", "34.4"); prefs.setCharPref("addonVersion", "34.5");
prefs.setCharPref("defaultRegion", "NOTSET"); prefs.setCharPref("defaultRegion", "NOTSET");
prefs.setBoolPref("localDataEncryption", false); prefs.setBoolPref("localDataEncryption", false);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Description about="urn:mozilla:install-manifest"> <Description about="urn:mozilla:install-manifest">
<em:id>cardbook@vigneau.philippe</em:id> <em:id>cardbook@vigneau.philippe</em:id>
<em:name>CardBook</em:name> <em:name>CardBook</em:name>
<em:version>34.4</em:version> <em:version>34.5</em:version>
<em:type>2</em:type> <em:type>2</em:type>
<em:description>vCard Address Book</em:description> <em:description>vCard Address Book</em:description>
<em:creator>Philippe Vigneau</em:creator> <em:creator>Philippe Vigneau</em:creator>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment