Changeset 7527

Timestamp:

11/27/06 23:24:18 (5 years ago)

Author:

sys

Message:

Sélection du bon dossier pour la création d'item + controle de l'état dirty

Location:

trunk/Xul_Cms/content/scenaricms/widgets/item

Files:

• editrefitem.js (modified) (6 diffs)
• editrefitem.xul (modified) (1 diff)

trunk/Xul_Cms/content/scenaricms/widgets/item/editrefitem.js

@@ -54 +54 @@
  */
 desk.canUnloadCurrentView = function(pSilentMode) {
-        return true;
+        var vCanUnload = true;
+        try{vCanUnload = this.fMainView.contentWindow.canUnload(pSilentMode);}catch(e){ut.debug(e+"\n"+ut.listProperties(this.fMainView))}
+        return vCanUnload;
 }
 
@@ -167 +169 @@
         if(window.arguments) {
                 this.fItemSel.setItem(pSp, pCd, pUriRes);
+                document.getElementById("btnSel").disabled =  ! pCd;
         } else {
+                //On est en iframe.
                 this.fRefItem.setItem(pSp, pCd, pUriRes);
                 this.fRefItem.xFireChangeItem();
@@ -189 +193 @@
 
 desk.selectAndClose = function(){
+        if( ! desk.canUnloadCurrentView(false)) return;
         this.fRefItem.setItem(this.fItemSel.fSp, this.fItemSel.fCd, this.fItemSel.fUriRes, this.fItemSel.fSpSs, this.fItemSel.fCdSs, this.fItemSel.fPack, this.fItemSel.fModel, this.fItemSel.fTitle, this.fItemSel.fStatus, this.fItemSel.fItemDef);
         this.fRefItem.xFireChangeItem();
@@ -202 +207 @@
 }
 
+desk.canCloseDesk = function(){
+        return this.canUnloadCurrentView(false);
+}
 
 
@@ -335 +343 @@
                 pUriObject.activate(this.setUriObjectActivated, this);
                 var vCd = ut.getCodeFromUri(pUriObject.getUri());
-                if(vCd) this.setRefItem(ut.getSpaceFromUri(pUriObject.getUri()), vCd, ut.getUriResFromUri(pUriObject.getUri()));
+                this.setRefItem(ut.getSpaceFromUri(pUriObject.getUri()), vCd, ut.getUriResFromUri(pUriObject.getUri()));
         }
 }
@@ -376 +384 @@
         var vNewUriObject = vWspView.getUriObject();
         if(vNewUriObject && (!vCurrentUriObject || vNewUriObject.getUri()!=vCurrentUriObject.getUri())){
-                desk.activateUriObject(vNewUriObject);
-        }
-}
+                if(desk.canUnloadCurrentView(false)) desk.activateUriObject(vNewUriObject);
+        }
+}

trunk/Xul_Cms/content/scenaricms/widgets/item/editrefitem.xul

@@ -40 +40 @@
 
 <?xml-stylesheet href="chrome://scenaricms/content/widgets/item/editrefitem.css" type="text/css"?>
-<window id="editrefitem" title="Référence à un item" width="800" height="600" orient="vertical" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xbl="http://www.mozilla.org/xbl" onload="desk.initDesk();" onunload="desk.destroyDesk();" ondragdrop="event.preventBubble();" persist="screenX screenY width height sizemode">
+<window id="editrefitem" title="Référence à un item" width="800" height="600" orient="vertical" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xbl="http://www.mozilla.org/xbl" onload="desk.initDesk();" onunload="desk.destroyDesk();" onclose="return desk.canCloseDesk();" ondragdrop="event.preventBubble();" persist="screenX screenY width height sizemode">
         <script src="chrome://scenaricms/content/ut.js"/>
         <script src="chrome://scenaricms/content/transf.js"/>