Changeset 4625cfd8d9f3160352b96bbb0c2088cd62c5fce9

Timestamp:

03/14/11 08:57:31 (14 months ago)

Author:

Robin Gareus <robin@…>

Parents:

a3706cf61a210c0acbba31fc661ca48f97086fcf

Children:

831f721f57c9e20cd62b268b88db9272b74059a2

git-committer:

Robin Gareus <robin@gareus.org> / 2011-03-14T09:57:31Z+0100

Message:

sansarmes: pre-merge 3->1 name updates

Location:

flex/sansarmes

Files:

• paroles.mxml (modified) (12 diffs)
• read.mxml (modified) (7 diffs)

flex/sansarmes/paroles.mxml

@@ -9 +9 @@
     creationComplete="onAppInit()" >
 
-    <mx:HTTPService id="lyrreq" resultFormat="text"
+    <mx:HTTPService id="lyrpst" resultFormat="text"
                     url="http://tac1.theartcollider.org/sansarmes/txtdb.php"
-                    result="onReqOK(event)"
-                    fault="onReqFault(event)"
+                    result="onPstOK(event)"
+                    fault="onPstFault(event)"
                     concurrency="single"
                     method="POST" />
@@ -28 +28 @@
 
             private var mytext:String;
-
-            //private var lyricsarray:Array;
-            private var karaoketime:Array;
-            private var initparoles:Boolean;
-
-            [Bindable]
-            private var parolenames:Array;
-
             private var marseillaise:String =""
 +"Allons enfants de la Patrie,\n"
@@ -129 +121 @@
             private function onAppInit():void
             {
-                initparoles = true;
-                parolenames=new Array('acune');
-                //lyricsarray=new Array();
-
-                lyrreq.send({mode:"list"});
-
-            }
-
-            private function onReqOK(event:ResultEvent):void {
+
+            }
+
+            private function onPstOK(event:ResultEvent):void {
                 var rawData:String = String(event.result);
                 //Alert.show('debug:\n'+rawData,'Debug.', mx.controls.Alert.OK);
-                if (initparoles) {
-                    initparoles=false;
-                    if (rawData=="") return;
-                    parolenames = rawData.split("\n");
-                    return;
-                }
 
                 // TODO -> check if submit went OK
@@ -164 +145 @@
             }
 
-            private function onReqFault(event:FaultEvent):void {
+            private function onPstFault(event:FaultEvent):void {
                 Alert.show("Echec de connexion avec le serveur. vérifiez votre connexion Internet.", "Offline", mx.controls.Alert.OK);
             }
@@ -170 +151 @@
             private function license_choise(eventObj:CloseEvent):void {
                 if (eventObj.detail==Alert.YES) {
-                    lyrreq.send({mode:"save", text:parole.text, author:ta.text, title:tt.text, email:te.text});
+                    lyrpst.send({mode:"save", text:WRparole.text, author:WRta.text, title:WRtt.text, email:WRte.text});
                 }
             }
@@ -187 +168 @@
 
             public function verifyParole(event:Event):Boolean {
-                var txt:Array = parole.text.split("\r");
+                var txt:Array = WRparole.text.split("\r");
                 var line:int = 0; var sepline:int = 8;
                 var err:String = "";
@@ -218 +199 @@
                     return false;
                 }
-                parole.text=txt.join('\r');
+                WRparole.text=txt.join('\r');
                 if (event) {
                     Alert.show('Le texte est structurée correctement.', 'Proposition valide.', mx.controls.Alert.OK);
@@ -226 +207 @@
 
             public function toggleParole(event:Event):void {
-                if(bo.selected) {
-                    bs.enabled=false;
-                    parole.editable=false;
-                    mytext=parole.text;
-                    parole.text=marseillaise;
-                    parole.setStyle("color", 0x808080);
+                if(WRbo.selected) {
+                    WRbs.enabled=false;
+                    WRparole.editable=false;
+                    mytext=WRparole.text;
+                    WRparole.text=marseillaise;
+                    WRparole.setStyle("color", 0x808080);
                 } else {
-                    parole.text=mytext;
-                    parole.editable=true;
-                    parole.setStyle("color", 0x000000);
-                    bs.enabled=true;
+                    WRparole.text=mytext;
+                    WRparole.editable=true;
+                    WRparole.setStyle("color", 0x000000);
+                    WRbs.enabled=true;
                 }
             }
@@ -282 +263 @@
             <mx:Box direction="horizontal" >
                 <mx:Label width="80" text="Titre:" />
-                <mx:TextInput id="tt" width="140" text="pas de titre" restrict="a-zA-Z0-9ÀÁÂÄÈÉÊËÌÍÎÏÒÓÔÖÙÚÛÜÇà áâÀÚéêëìíîïòóÎöùúûÌç, " maxChars="64"/>
+                <mx:TextInput id="WRtt" width="140" text="pas de titre" restrict="a-zA-Z0-9ÀÁÂÄÈÉÊËÌÍÎÏÒÓÔÖÙÚÛÜÇà áâÀÚéêëìíîïòóÎöùúûÌç, " maxChars="64"/>
             </mx:Box>
             <mx:Box direction="horizontal" >
                 <mx:Label width="80" text="Auteur:" />
-                <mx:TextInput id="ta" width="140" text="moi" restrict="a-zA-Z0-9ÀÁÂÄÈÉÊËÌÍÎÏÒÓÔÖÙÚÛÜÇà áâÀÚéêëìíîïòóÎöùúûÌç, " maxChars="64"/>
+                <mx:TextInput id="WRta" width="140" text="moi" restrict="a-zA-Z0-9ÀÁÂÄÈÉÊËÌÍÎÏÒÓÔÖÙÚÛÜÇà áâÀÚéêëìíîïòóÎöùúûÌç, " maxChars="64"/>
             </mx:Box>
             <mx:Text>
@@ -295 +276 @@
             <mx:Box direction="horizontal" >
                 <mx:Label width="80" text="Adresse email:" />
-                <mx:TextInput id="te" width="140" text="@" restrict="a-zA-Z@0-9._%+-" maxChars="128"/>
+                <mx:TextInput id="WRte" width="140" text="@" restrict="a-zA-Z@0-9._%+-" maxChars="128"/>
             </mx:Box>
             <mx:Spacer height="100%"/>
@@ -302 +283 @@
                 <![CDATA[<font face="Colaborate-Medium" size="12">Étape 3</font>: Vérifier la structure du texte]]>
             </mx:htmlText></mx:Text>
-            <mx:Button id="bv" click="verifyParole(event)" label="vérifier"/>
+            <mx:Button id="WRbv" click="verifyParole(event)" label="vérifier"/>
             <mx:Text><mx:htmlText>
                 <![CDATA[<font face="Colaborate-Medium" size="12">Étape 4</font>: Autoriser l'parole pour publication]]>
             </mx:htmlText></mx:Text>
-            <mx:Button id="bs" click="submitParole(event)" label="publier"/>
+            <mx:Button id="WRbs" click="submitParole(event)" label="publier"/>
 
         </mx:VBox>
@@ -315 +296 @@
                 </mx:htmlText></mx:Text>
                 <mx:Spacer width="100%"/>
-                <mx:Button id="bo" toggle="true" change="toggleParole(event)" label="View Marseillaise"/>
+                <mx:Button id="WRbo" toggle="true" change="toggleParole(event)" label="View Marseillaise"/>
             </mx:Box>
             <mx:Spacer height="1"/>
-            <mx:TextArea id="parole" width="100%" height="100%"
+            <mx:TextArea id="WRparole" width="100%" height="100%"
                 wordWrap="false" text="" condenseWhite="false"
                 restrict="a-zA-Z0-9ÀÁÂÄÈÉÊËÌÍÎÏÒÓÔÖÙÚÛÜÇà áâÀÚéêëìíîïòóÎöùúûÌç,.'?!()- " />

flex/sansarmes/read.mxml

@@ -9 +9 @@
     creationComplete="onAppInit()" >
 
-    <mx:HTTPService id="lyrreq" resultFormat="text"
+    <mx:HTTPService id="parreq" resultFormat="text"
                     url="http://tac1.theartcollider.org/sansarmes/txtdb.php"
-                    result="onReqOK(event)"
+                    result="onParOK(event)"
                     fault="onReqFault(event)"
                     concurrency="single"
@@ -42 +42 @@
                 lyricsarray=new Array();
 
-                lyrreq.send({mode:"list"});
+                parreq.send({mode:"list"});
 
             }
 
-            private function onReqOK(event:ResultEvent):void {
+            private function onParOK(event:ResultEvent):void {
                 var rawData:String = String(event.result);
                 //Alert.show('debug:\n'+rawData,'Debug.', mx.controls.Alert.OK);
@@ -68 +68 @@
                     l+= verse?6:9; verse=!verse;
                 }
-                parole.text = lyricsarray.join("\r");
+                RDparole.text = lyricsarray.join("\r");
             }
 
@@ -78 +78 @@
             /*
                 initparoles = true;
-                lyrreq.send({mode:"list"});
+                parreq.send({mode:"list"});
             */
             }
@@ -85 +85 @@
                 var id:int = event.currentTarget.selectedIndex;
                 if (id < 1) {
-                    parole.text = ""
-                    lt.text="";
+                    RDparole.text = ""
+                    RDlt.text="";
                     return;
                 }
-                lyrreq.send({mode:"get", id:(id)});
-                lt.text=parolenames[id];
+                parreq.send({mode:"get", id:(id)});
+                RDlt.text=parolenames[id];
             }
 
@@ -131 +131 @@
                 <![CDATA[<font face="Colaborate-Medium" size="12">Choisissez paroles de l'affichage:</font>]]>
             </mx:htmlText></mx:Text>
-            <mx:ComboBox id="st" width="210" dataProvider="{parolenames}" change="selectParole(event)"/>
+            <mx:ComboBox id="RDst" width="210" dataProvider="{parolenames}" change="selectParole(event)"/>
         </mx:VBox>
         <mx:VBox width="100%" height="100%">
@@ -138 +138 @@
                     <![CDATA[<font face="Colaborate-Medium" size="12">Parole:</font>]]>
                 </mx:htmlText></mx:Text>
-                <mx:Label id="lt" text=""/>
+                <mx:Label id="RDlt" text=""/>
                 <mx:Spacer width="100%"/>
                 <!--
-                <mx:Button id="bs" click="reloadParoles(event)" label="reload"/>
+                <mx:Button id="RDbs" click="reloadParoles(event)" label="reload"/>
                 -->
             </mx:Box>
             <mx:Spacer height="1"/>
-            <mx:TextArea id="parole" width="100%" height="100%"
+            <mx:TextArea id="RDparole" width="100%" height="100%"
                 wordWrap="false" text="" condenseWhite="false" editable="false" />
         </mx:VBox>