[pLog-svn] r7101 - in plog/branches/lifetype-1.2/js/tinymce/plugins: insertaudio insertaudio/langs insertvideo

mark at devel.lifetype.net mark at devel.lifetype.net
Wed Dec 22 06:48:33 EST 2010


Author: mark
Date: 2010-12-22 06:48:32 -0500 (Wed, 22 Dec 2010)
New Revision: 7101

Modified:
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/dialog.htm
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/langs/en_dlg.js
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/functions.js
Log:
Add url validation for insertaudio, need some code refactoring in some day future.

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/dialog.htm
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/dialog.htm	2010-12-21 18:11:22 UTC (rev 7100)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/dialog.htm	2010-12-22 11:48:32 UTC (rev 7101)
@@ -2,10 +2,28 @@
 <head>
     <title>{#insertaudio_dlg.title}</title>
     <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+    <script type="text/javascript" src="../../tiny_mce-plog-resourcelist.js"></script>
     <script type="text/javascript">
         tinyMCEPopup.requireLangPack();
+        function isValidUrl( url )
+        {
+            var regexp = /(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/;
+            return regexp.test(url);
+        }
+
+        function insertAudioCode()
+        {
+            // get and check the URL
+            url = document.audio.url.value;
+            if( url === "" || !isValidUrl( url )) {
+                window.alert( tinyMCEPopup.getLang('insertaudio_dlg.badurl', 0) );
+                return( false );
+            }
+
+            insertMediaPlayer(url,true,'20','300');
+            return true
+        }
     </script>
-    <script type="text/javascript" src="../../tiny_mce-plog-resourcelist.js"></script>
     <base target="_self" />
 </head>
 <body style="display: none">
@@ -28,7 +46,7 @@
         </div>
         <div class="mceActionPanel">
             <div style="float:left">
-                <input type="button" name="insert" value="{#insert}" onClick="insertMediaPlayer(document.audio.url.value,true,'20','300')" id="insert" />
+                <input type="button" name="insert" value="{#insert}" onClick="insertAudioCode();" id="insert" />
             </div>
             <div style="float:right">
                 <input type="button" name="cancel" value="{#close}" onclick="tinyMCEPopup.close();" id="cancel" />

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/langs/en_dlg.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/langs/en_dlg.js	2010-12-21 18:11:22 UTC (rev 7100)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/langs/en_dlg.js	2010-12-22 11:48:32 UTC (rev 7101)
@@ -2,5 +2,6 @@
       title : 'Insert audio',
       panel_legend : 'Please provide a link to an mp3 audio file.',
       audio_url : 'Audio URL:',
+      badurl : 'Invalid URL',
       inputurlstyle : 'style="width:350px"'
 });

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/functions.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/functions.js	2010-12-21 18:11:22 UTC (rev 7100)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/functions.js	2010-12-22 11:48:32 UTC (rev 7101)
@@ -256,6 +256,8 @@
         css="ltVideoDailymot";
     }
     insertFlash( link, css, width, height );
+
+    return true;
 }
 
 function insertFlash( file, css, width, height ) {



More information about the pLog-svn mailing list