summaryrefslogtreecommitdiff
path: root/frontend/beta/js/Clipperz
Unidiff
Diffstat (limited to 'frontend/beta/js/Clipperz') (more/less context) (show whitespace changes)
-rw-r--r--frontend/beta/js/Clipperz/PM/DataModel/UserPreferences.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/UserPreferences.js b/frontend/beta/js/Clipperz/PM/DataModel/UserPreferences.js
index 9e80b3a..919289d 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/UserPreferences.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/UserPreferences.js
@@ -86,109 +86,110 @@ Clipperz.PM.DataModel.UserPreferences.prototype = MochiKit.Base.update(null, {
86//MochiKit.Logging.logDebug("<<< UserPreferences.configValue"); 86//MochiKit.Logging.logDebug("<<< UserPreferences.configValue");
87 87
88 return result; 88 return result;
89 }, 89 },
90 90
91 'setConfigValue': function(aConfigName, aValue) { 91 'setConfigValue': function(aConfigName, aValue) {
92 var result; 92 var result;
93 93
94 if (aValue != this.configValue(aConfigName)) { 94 if (aValue != this.configValue(aConfigName)) {
95 if (aValue == null) { 95 if (aValue == null) {
96 delete this.config()[aConfigName] 96 delete this.config()[aConfigName]
97 } else { 97 } else {
98 this.config()[aConfigName] = aValue; 98 this.config()[aConfigName] = aValue;
99 } 99 }
100 100
101 Clipperz.NotificationCenter.notify(this.user(), 'updatedSection', 'preferences', true); 101 Clipperz.NotificationCenter.notify(this.user(), 'updatedSection', 'preferences', true);
102 102
103 result = true; 103 result = true;
104 } else { 104 } else {
105 result = false; 105 result = false;
106 } 106 }
107 107
108 return result; 108 return result;
109 }, 109 },
110 110
111 //------------------------------------------------------------------------- 111 //-------------------------------------------------------------------------
112 112
113 'useSafeEditMode': function() { 113 'useSafeEditMode': function() {
114 return this.configValue('useSafeEditMode', true); 114 return this.configValue('useSafeEditMode', true);
115 }, 115 },
116 116
117 'setUseSafeEditMode': function(aValue) { 117 'setUseSafeEditMode': function(aValue) {
118 this.setConfigValue('useSafeEditMode', aValue); 118 this.setConfigValue('useSafeEditMode', aValue);
119 }, 119 },
120 120
121 //------------------------------------------------------------------------- 121 //-------------------------------------------------------------------------
122 122
123 'preferredLanguage': function() { 123 'preferredLanguage': function() {
124 return this.configValue('preferredLanguage', null); 124 return this.configValue('preferredLanguage', null);
125 }, 125 },
126 126
127 'setPreferredLanguage': function(aValue) { 127 'setPreferredLanguage': function(aValue) {
128 if (this.setConfigValue('preferredLanguage', aValue)) { 128 if (this.setConfigValue('preferredLanguage', aValue)) {
129 Clipperz.PM.Strings.Languages.setSelectedLanguage(this.preferredLanguage()); 129 Clipperz.PM.Strings.Languages.setSelectedLanguage(this.preferredLanguage());
130 } 130 }
131 }, 131 },
132 132
133 //------------------------------------------------------------------------- 133 //-------------------------------------------------------------------------
134 134
135 'shouldShowDonationPanel': function() { 135 'shouldShowDonationPanel': function() {
136 return this.configValue('shouldShowDonationPanel', true); 136 return this.configValue('shouldShowDonationPanel', true);
137 }, 137 },
138 138
139 'setShouldShowDonationPanel': function(aValue) { 139 'setShouldShowDonationPanel': function(aValue) {
140 this.setConfigValue('shouldShowDonationPanel', aValue); 140 this.setConfigValue('shouldShowDonationPanel', aValue);
141 }, 141 },
142 142
143 //------------------------------------------------------------------------- 143 //-------------------------------------------------------------------------
144 144
145 'disableUnsecureFaviconLoadingForIE': function() { 145 'disableUnsecureFaviconLoadingForIE': function() {
146 return this.configValue('disableUnsecureFaviconLoadingForIE', false); 146 return this.configValue('disableUnsecureFaviconLoadingForIE', false);
147 }, 147 },
148 148
149 'setDisableUnsecureFaviconLoadingForIE': function(aValue) { 149 'setDisableUnsecureFaviconLoadingForIE': function(aValue) {
150 this.setConfigValue('disableUnsecureFaviconLoadingForIE', aValue); 150 this.setConfigValue('disableUnsecureFaviconLoadingForIE', aValue);
151 }, 151 },
152 152
153 //------------------------------------------------------------------------- 153 //-------------------------------------------------------------------------
154 154
155 'serializedData': function() { 155 'serializedData': function() {
156 return this.config(); 156 return this.config();
157 }, 157 },
158 158
159 //------------------------------------------------------------------------- 159 //-------------------------------------------------------------------------
160 160
161 'saveChanges': function(aReferenceElement) { 161 'saveChanges': function(aReferenceElement) {
162 vardeferredResult; 162 vardeferredResult;
163 163
164 deferredResult = new MochiKit.Async.Deferred(); 164 deferredResult = new MochiKit.Async.Deferred();
165 165
166 deferredResult.addCallback(MochiKit.Base.method(Clipperz.PM.Components.MessageBox(), 'deferredShow'), 166 deferredResult.addCallback(MochiKit.Base.method(Clipperz.PM.Components.MessageBox(), 'deferredShow'),
167 { 167 {
168 title:"", //Clipperz.PM.Strings['accountPreferencesSavingPanelTitle_Step1'], 168 title:"", //Clipperz.PM.Strings['accountPreferencesSavingPanelTitle_Step1'],
169 text:"", //Clipperz.PM.Strings['accountPreferencesSavingPanelText_Step1'], 169 text:"", //Clipperz.PM.Strings['accountPreferencesSavingPanelText_Step1'],
170 width:240, 170 width:240,
171 showProgressBar:true, 171 showProgressBar:true,
172 showCloseButton:false 172 showCloseButton:false
173 }, 173 },
174 aReferenceElement 174 aReferenceElement
175 ); 175 );
176 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'account_savingPreferences_1'); 176 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'account_savingPreferences_1');
177 deferredResult.addCallback(MochiKit.Base.method(this.user(), 'encryptedData')); 177 deferredResult.addCallback(MochiKit.Base.method(this.user(), 'encryptedData'));
178 deferredResult.addCallback(function(res) { 178 deferredResult.addCallback(function(res) {
179 return {user:res}; 179 return {user:res};
180 }) 180 })
181 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'account_savingPreferences_2'); 181 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'account_savingPreferences_2');
182 deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'updateData'); 182 // deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'updateData');
183 deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'saveChanges');
183 deferredResult.addCallback(Clipperz.PM.Components.MessageBox().hide, YAHOO.ext.Element.get('main')); 184 deferredResult.addCallback(Clipperz.PM.Components.MessageBox().hide, YAHOO.ext.Element.get('main'));
184 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedPreferences', null); 185 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedPreferences', null);
185 186
186 deferredResult.callback(); 187 deferredResult.callback();
187 188
188 return deferredResult; 189 return deferredResult;
189 }, 190 },
190 191
191 //------------------------------------------------------------------------- 192 //-------------------------------------------------------------------------
192 __syntaxFix__: "syntax fix" 193 __syntaxFix__: "syntax fix"
193}); 194});
194 195