Author: jmorliaguet Date: Thu Jun 8 10:38:51 2006 New Revision: 3354 Modified: cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
Log: - fixes and reset the editor when it is loaded for the first time Modified: cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py ============================================================================== --- cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py (original) +++ cpsskins/branches/paris-sprint-2006/standard/screens/styleeditor/views.py Thu Jun 8 10:38:51 2006 @@ -67,6 +67,12 @@ return markup def getStyleEditorData(self): + element_data = self.element_data + init = element_data['init'] + if init: + element_data['init'] = False + self.element_data = element_data + return {} value = self.request.cookies.get(self.storage_id) if value is not None: return json.read(unquote(value)) Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.js Thu Jun 8 10:38:51 2006 @@ -43,20 +43,17 @@ function editElement(info) { var data = info.model.getData(); var perspectives = CPSSkins.getControllerById('main-editor-perspectives'); - CPSSkins.getModelById('element-editor').updateData({id: data.id}); + CPSSkins.getModelById('element-editor').updateData({id: data.id, init: true}); perspectives.switchTo('element-editor'); } function editFormat(info) { var data = info.model.getData(); - var id = data.id; var options = info.options; - CPSSkins.getModelById('element-editor').updateData({ - form: {id: id, display: data.display, format: data.format, uri: data.uri, - tab: options.choice} - }); - CPSSkins.getControllerById('main-editor-perspectives').switchTo( - 'element-editor'); + var perspectives = CPSSkins.getControllerById('main-editor-perspectives'); + CPSSkins.getModelById('element-editor').updateData( + {id: data.id, tab: options.choice, init: true}); + perspectives.switchTo('element-editor'); } function duplicateElement(info) { Modified: cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py Thu Jun 8 10:38:51 2006 @@ -31,6 +31,7 @@ 'script': '++resource++style_editor.js', 'id': 0, 'tab': '', + 'init': True, }, }, -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins