Vlad Kurkin (b_vladi) wrote in changelog,
Vlad Kurkin
b_vladi
changelog

[livejournal] r19362: =LJSUP-9159: Update and improve RTE by C...

Committer: vkurkin
=LJSUP-9159: Update and improve RTE by CKEditor 3.6.1
U   trunk/cgi-bin/LJ/Widget/EntryForm.pm
U   trunk/htdocs/js/entry.js
U   trunk/htdocs/js/poll.js
U   trunk/htdocs/js/rte.js
U   trunk/htdocs/tools/fck_poll.bml
Modified: trunk/cgi-bin/LJ/Widget/EntryForm.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/EntryForm.pm	2011-06-24 10:13:58 UTC (rev 19361)
+++ trunk/cgi-bin/LJ/Widget/EntryForm.pm	2011-06-27 06:41:09 UTC (rev 19362)
@@ -148,7 +148,7 @@
     push @ret, qw(
         js/ippu.js
         js/lj_ippu.js
-        stc/fck/fckeditor.js
+        stc/ck/ckeditor.js
         js/rte.js
         stc/display_none.css
     );
@@ -1462,21 +1462,11 @@
 
         my $jnorich = LJ::ejs(LJ::deemp(BML::ml('entryform.htmlokay.norich2')));
         $out .= $self->wrap_js(qq{
-            FCKeditor_IsCompatibleBrowser = (function(FCKeditor_IsCompatibleBrowser) {
-                return function() {
-                    if (/iPad|iPhone/.test(navigator.userAgent)) {
-                        return false;
-                    }
-                    return FCKeditor_IsCompatibleBrowser();
-                };
-            }(FCKeditor_IsCompatibleBrowser));
-            var FCKLang = FCKLang || {};
-            jQuery.extend(FCKLang, $langmap);
-            if (!FCKeditor_IsCompatibleBrowser()) {
-                document.getElementById('htmltools').style.display = 'block';
-                document.write("$jnorich");
-                usePlainText('draft');
-            }
+            var CKLang = CKEDITOR.lang[CKEDITOR.lang.detect()] || {};
+            jQuery.extend(CKLang, $langmap);
+						document.getElementById('htmltools').style.display = 'block';
+						document.write("$jnorich");
+						usePlainText('draft');
         });
 
         $out .= qq{

Modified: trunk/htdocs/js/entry.js
===================================================================
--- trunk/htdocs/js/entry.js	2011-06-24 10:13:58 UTC (rev 19361)
+++ trunk/htdocs/js/entry.js	2011-06-27 06:41:09 UTC (rev 19362)
@@ -2,1334 +2,1473 @@
 var sc_old_border_style;
 var shift_init = "true";
 
-if (! ("$" in window))
-    $ = function(id) {
-        if (document.getElementById)
-           return document.getElementById(id);
-        return null;
-    };
+if(! ("$" in window)){
+	$ = function(id){
+		if(document.getElementById){
+			return document.getElementById(id);
+		}
+		return null;
+	};
+}
 
-function editdate() {
+function editdate(){
 	clearInterval(settime.interval);
 	$('currentdate').style.display = 'none';
 	$('modifydate').style.display = 'inline';
 }
 
-function showEntryTabs() {
-	if (FCKeditor_IsCompatibleBrowser()) {
-		document.getElementById('entry-tabs').style.visibility = 'visible';
-	}
+function showEntryTabs(){
+	document.getElementById('entry-tabs').style.visibility = 'visible';
 }
 
-function changeSubmit(prefix, defaultjournal, defPrefix ) {
-    if (document.getElementById) {
-        var usejournal = document.getElementById('usejournal');
-        var formsubmit = document.getElementById('formsubmit');
-        var newvalue, commname;
-        if (!defaultjournal) {
-            newvalue = prefix;
-        } else if (!usejournal || usejournal.value == '') {
-            newvalue = prefix + ' ' + defaultjournal;
-            commname = defaultjournal;
-        } else {
-            if( usejournal.value === '[none]' ) {
-                newvalue = defPrefix;
-            } else {
-                newvalue = prefix + ' ' + usejournal.value;
-            }
-            commname = usejournal.value;
-        }
-        formsubmit.disabled = ( /\[none\]/.test( commname ) || /^ext_/.test( commname ) );
-        formsubmit.value = newvalue;
-    }
+function changeSubmit(prefix, defaultjournal, defPrefix){
+	if(document.getElementById){
+		var usejournal = document.getElementById('usejournal');
+		var formsubmit = document.getElementById('formsubmit');
+		var newvalue, commname;
+		if(!defaultjournal){
+			newvalue = prefix;
+		} else if(!usejournal || usejournal.value == ''){
+			newvalue = prefix + ' ' + defaultjournal;
+			commname = defaultjournal;
+		} else {
+			if(usejournal.value === '[none]'){
+				newvalue = defPrefix;
+			} else {
+				newvalue = prefix + ' ' + usejournal.value;
+			}
+			commname = usejournal.value;
+		}
+		formsubmit.disabled = ( /\[none\]/.test(commname) || /^ext_/.test(commname) );
+		formsubmit.value = newvalue;
+	}
 }
 
-function new_post_load(dotime) {
-	if (dotime) {
-		settime.interval = setInterval(settime, 1000)
+function new_post_load(dotime){
+	if(dotime){
+		settime.interval = setInterval(settime, 1000);
 		settime();
 	}
-	
-    var remotelogin = $('remotelogin');
-    if (! remotelogin) return;
-    var remotelogin_content = $('remotelogin_content');
-    if (! remotelogin_content) return;
-    remotelogin_content.onclick = altlogin;
-    f = document.updateForm;
-    if (! f) return false;
-	
-    var userbox = f.user;
-    if (! userbox) return false;
-    if (! Site.has_remote && userbox.value) altlogin();
 
-    return false;
+	var remotelogin = $('remotelogin');
+	if(! remotelogin){
+		return;
+	}
+	var remotelogin_content = $('remotelogin_content');
+	if(! remotelogin_content){
+		return;
+	}
+	remotelogin_content.onclick = altlogin;
+	f = document.updateForm;
+	if(! f){
+		return false;
+	}
+
+	var userbox = f.user;
+	if(! userbox){
+		return false;
+	}
+	if(! Site.has_remote && userbox.value){
+		altlogin();
+	}
+
+	return false;
 }
 
-function updateRepostButtons(stateIndex)
-{
-    var boxes = ['facebook', 'twitter'],
-        input, label, parentNode,
-        parentDisableClass = 'b-repost-item-disabled',
+function updateRepostButtons(stateIndex){
+	var boxes = ['facebook', 'twitter'],
+		input, label, parentNode,
+		parentDisableClass = 'b-repost-item-disabled',
 		linkDisclass = 'b-repost-item-dis';
 
-    for(var i in boxes)
-    {
-        input = $('repost_' + boxes[i]);
-        if(!input) continue;
+	for(var i in boxes){
+		input = $('repost_' + boxes[i]);
+		if(!input){
+			continue;
+		}
 
-        parentNode = input.parentNode;
-        label = parentNode.getElementsByTagName('label')[0];
+		parentNode = input.parentNode;
+		label = parentNode.getElementsByTagName('label')[0];
 
-        if(stateIndex > 0 || parentNode.className.indexOf(parentDisableClass) != -1)
-        {
-            input.setAttribute('disabled', 'disabled');
-            label.className = "repost_disabled";
-            input.checked = false;
-			if(parentNode.className.indexOf(linkDisclass) == -1) {
+		if(stateIndex > 0 || parentNode.className.indexOf(parentDisableClass) != -1){
+			input.setAttribute('disabled', 'disabled');
+			label.className = "repost_disabled";
+			input.checked = false;
+			if(parentNode.className.indexOf(linkDisclass) == -1){
 				parentNode.className += " " + linkDisclass;
 			}
-        }
-        else {
-            input.removeAttribute('disabled');
-            label.className = "repost_" + boxes[i];
+		} else {
+			input.removeAttribute('disabled');
+			label.className = "repost_" + boxes[i];
 			parentNode.className = parentNode.className.replace(" " + linkDisclass, "");
-        }
-    }
+		}
+	}
 
 }
 
-function customboxes (e) {
-    if (! e) var e = window.event;
-    if (! document.getElementById) return false;
+function customboxes(e){
+	if(! e){
+		e = window.event;
+	}
+	if(! document.getElementById){
+		return false;
+	}
 
-    
-    f = document.updateForm;
-    if (! f) return false;
-    
-    var custom_boxes = $('custom_boxes');
-    if (! custom_boxes) return false;
+	var f = document.updateForm;
+	if(! f){
+		return false;
+	}
 
-    updateRepostButtons(f.security.selectedIndex);
-    
-    if (f.security.selectedIndex != 3) {
-        custom_boxes.style.display = 'none';
-        return false;
-    }
-    
-    var altlogin_username = $('altlogin_username');    
-    if (altlogin_username != undefined && (altlogin_username.style.display == 'table-row' ||
-                                           altlogin_username.style.display == 'block')) {
-        f.security.selectedIndex = 0;
-        custom_boxes.style.display = 'none';
-        alert("Custom security is only available when posting as the logged in user.");
-    } else {
-        custom_boxes.style.display = 'block';
-    }
-    
-    if (e) {
-        e.cancelBubble = true;
-        if (e.stopPropagation) e.stopPropagation();
-    }
-    return false;
+	var custom_boxes = $('custom_boxes');
+	if(! custom_boxes){
+		return false;
+	}
+
+	updateRepostButtons(f.security.selectedIndex);
+
+	if(f.security.selectedIndex != 3){
+		custom_boxes.style.display = 'none';
+		return false;
+	}
+
+	var altlogin_username = $('altlogin_username');
+	if(altlogin_username != undefined && (altlogin_username.style.display == 'table-row' || altlogin_username.style
+		.display == 'block')){
+		f.security.selectedIndex = 0;
+		custom_boxes.style.display = 'none';
+		alert("Custom security is only available when posting as the logged in user.");
+	} else {
+		custom_boxes.style.display = 'block';
+	}
+
+	if(e){
+		e.cancelBubble = true;
+		if(e.stopPropagation){
+			e.stopPropagation();
+		}
+	}
+	return false;
 }
 
-function setCopyrightUpdate() {
-    if ($('prop_copyright') && Site.default_copyright == "P") {
-        $('prop_copyright').checked = 1;
-    }
+function setCopyrightUpdate(){
+	if($('prop_copyright') && Site.default_copyright == "P"){
+		$('prop_copyright').checked = 1;
+	}
 }
 
-
 function detectLocation(){
 
-	function myFunctionForLoadDistr(url)
-	{
-	 //alert('Magic Scanner is not installed, download it at '+url);
-	 wi2Geo.response=true;
+	function myFunctionForLoadDistr(url){
+		//alert('Magic Scanner is not installed, download it at '+url);
+		wi2Geo.response = true;
 	}
-	
-	var wi2Geo={};
-	var gGears={};
 
-	wi2Geo.response=false;
-	gGears.response=false;
+	var wi2Geo = {};
+	var gGears = {};
 
-	function updateWi2GeoPosition(q)
-	{
-	          if(q){		
-		  	wi2Geo.country=q.city.country;
-		  	wi2Geo.city=q.city.name;
-			wi2Geo.type=q.type;
-			if(wi2Geo.type!='IP'){
-		  		wi2Geo.street=q.building.street;
-		  		wi2Geo.building=q.building.address;
-				wi2Geo.metro=q.metro.name;
+	wi2Geo.response = false;
+	gGears.response = false;
+
+	function updateWi2GeoPosition(q){
+		if(q){
+			wi2Geo.country = q.city.country;
+			wi2Geo.city = q.city.name;
+			wi2Geo.type = q.type;
+			if(wi2Geo.type != 'IP'){
+				wi2Geo.street = q.building.street;
+				wi2Geo.building = q.building.address;
+				wi2Geo.metro = q.metro.name;
 			}
-		  	wi2Geo.lat=q.lat;
-		  	wi2Geo.lng=q.lng;
-		  }
-		  wi2Geo.response=true;
-	 }
-	
-	function updateGearsPosition(p) {
+			wi2Geo.lat = q.lat;
+			wi2Geo.lng = q.lng;
+		}
+		wi2Geo.response = true;
+	}
+
+	function updateGearsPosition(p){
 		if(p){
-		  gGears.country=(!p.gearsAddress.country.match(/\?\?/gi)?(p.gearsAddress.country):(""));
-		  gGears.city=(!p.gearsAddress.city.match(/\?\?/gi)?(p.gearsAddress.city):(""));
-		  if(gGears.country=='USA') gGears.region=p.gearsAddress.region;
-		  gGears.lat=p.coords.latitude;
-		  gGears.lng=p.coords.longitude;
-		  gGears.type=(p.accuracy<1000&&p.accuracy>0)?("nonIP"):("IP");
-		  if(gGears.type!='IP' && !p.gearsAddress.street.match(/\?\?/gi)){
-		  	gGears.street=p.gearsAddress.street;
-		  	gGears.building=p.gearsAddress.streetNumber;
-		  }
-		  
+			gGears.country = (!p.gearsAddress.country.match(/\?\?/gi) ? (p.gearsAddress.country) : (""));
+			gGears.city = (!p.gearsAddress.city.match(/\?\?/gi) ? (p.gearsAddress.city) : (""));
+			if(gGears.country == 'USA'){
+				gGears.region = p.gearsAddress.region;
+			}
+			gGears.lat = p.coords.latitude;
+			gGears.lng = p.coords.longitude;
+			gGears.type = (p.accuracy < 1000 && p.accuracy > 0) ? ("nonIP") : ("IP");
+			if(gGears.type != 'IP' && !p.gearsAddress.street.match(/\?\?/gi)){
+				gGears.street = p.gearsAddress.street;
+				gGears.building = p.gearsAddress.streetNumber;
+			}
+
 		}
-		gGears.response=true;
-		wi2Geo.response=true;
+		gGears.response = true;
+		wi2Geo.response = true;
 	}
 
 	try{
-		var geo = google.gears.factory.create('beta.geolocation');	
+		var geo = google.gears.factory.create('beta.geolocation');
 		geo.getCurrentPosition(updateGearsPosition, handleError, {enableHighAccuracy: true, gearsRequestAddress: true});
-	}catch(e){
-		gGears.response=true;
+	} catch(e){
+		gGears.response = true;
 		try{
 			var myWi2GeoScanner = new Wi2GeoScanner('AQIAAKxzJUlHmzaMvzei5+vo3XLHJIdR', myFunctionForLoadDistr);
 			myWi2GeoScanner.scan(updateWi2GeoPosition);
-			if(window.opera) wi2Geo.response=true;
-		}catch(e){
-			wi2Geo.response=true;
+			if(window.opera){
+				wi2Geo.response = true;
+			}
+		} catch(e){
+			wi2Geo.response = true;
 		}
 
 	}
-	
-	function handleError(positionError) {
-		  gGears.response=true;
+
+	function handleError(positionError){
+		gGears.response = true;
 	}
 
-	var si=window.setInterval(function getLocation(){
-			if(wi2Geo.response==true && gGears.response==true){
-				window.clearInterval(si);
-				var fCountry=(gGears.country||wi2Geo.country)?((gGears.country||wi2Geo.country)+", "):("");
-				var fRegion=(gGears.region||wi2Geo.region)?((gGears.region||wi2Geo.region)+", "):("");
-				var fCity=(gGears.city||wi2Geo.city)?((gGears.city||wi2Geo.city)+", "):("");
-				if (fRegion==fCity) fRegion="";
-				var fStreet=(gGears.street||wi2Geo.street)?((gGears.street||wi2Geo.street)+", "):("");
-				if(fStreet=="") fCity=fCity.replace(/,/,"");
-				var fBuilding=gGears.building||wi2Geo.building||"";
-				var fMetro=(wi2Geo.metro)||"";
-				var fLat=(gGears.lat||wi2Geo.lat)?((gGears.lat||wi2Geo.lat)+", "):("");
-				var fLng=gGears.lng||wi2Geo.lng||"";
-				if(!fCountry || !fCity || !fLat || !fLng){
-					HTTPReq.getJSON({url:'/tools/endpoints/geo_location.bml',
-						onData:function(data){
-							if(data.data){
-								fCountry=(data.data.country_rus_name)?(data.data.country_rus_name+", "):(data.data.country_name+", ");
-								fCity=data.data.city_rus_name||data.data.city_name;
-								if(data.data.country_short=='US') fRegion=data.data.region_name+", ";
-								fLat=data.data.latitude+", ";
-								fLng=data.data.longitude;
-								$('prop_current_location').value=fCountry+fRegion+fCity;
-							}else{
-								$('prop_current_location').value="Can't Detect";
-								window.setTimeout(function(){$('prop_current_location').value=" "},3000);
+	var si = window.setInterval(function getLocation(){
+		if(wi2Geo.response && gGears.response){
+			window.clearInterval(si);
+			var fCountry = (gGears.country || wi2Geo.country) ? ((gGears.country || wi2Geo.country) + ", ") : ("");
+			var fRegion = (gGears.region || wi2Geo.region) ? ((gGears.region || wi2Geo.region) + ", ") : ("");
+			var fCity = (gGears.city || wi2Geo.city) ? ((gGears.city || wi2Geo.city) + ", ") : ("");
+			if(fRegion == fCity){
+				fRegion = "";
+			}
+			var fStreet = (gGears.street || wi2Geo.street) ? ((gGears.street || wi2Geo.street) + ", ") : ("");
+			if(fStreet == ""){
+				fCity = fCity.replace(/,/, "");
+			}
+			var fBuilding = gGears.building || wi2Geo.building || "";
+			var fMetro = (wi2Geo.metro) || "";
+			var fLat = (gGears.lat || wi2Geo.lat) ? ((gGears.lat || wi2Geo.lat) + ", ") : ("");
+			var fLng = gGears.lng || wi2Geo.lng || "";
+			if(!fCountry || !fCity || !fLat || !fLng){
+				HTTPReq.getJSON({url:'/tools/endpoints/geo_location.bml',
+					onData:function(data){
+						if(data.data){
+							fCountry = (data.data.country_rus_name) ? (data.data.country_rus_name + ", ") : (data.data
+								.country_name + ", ");
+							fCity = data.data.city_rus_name || data.data.city_name;
+							if(data.data.country_short == 'US'){
+								fRegion = data.data.region_name + ", ";
 							}
-						},
-						onError:LiveJournal.ajaxError
-						});
-				}
-				else{
-					$('prop_current_location').value=fCountry+fRegion+fCity+fStreet+fBuilding;
-				}
-				
+							fLat = data.data.latitude + ", ";
+							fLng = data.data.longitude;
+							$('prop_current_location').value = fCountry + fRegion + fCity;
+						} else {
+							$('prop_current_location').value = "Can't Detect";
+							window.setTimeout(function(){
+								$('prop_current_location').value = " "
+							}, 3000);
+						}
+					},
+					onError:LiveJournal.ajaxError
+				});
+			} else {
+				$('prop_current_location').value = fCountry + fRegion + fCity + fStreet + fBuilding;
 			}
-			else{
-				$('prop_current_location').value='detecting...';
-			}
-	},100);
-	
-	
+
+		} else {
+			$('prop_current_location').value = 'detecting...';
+		}
+	}, 100);
+
 }
 
-function setCopyrightEdit() {
-    if ($('security') && $('prop_copyright')) {
-	var copyright_flag=$('prop_copyright').checked;
-	if($('security').value!='public'){
-		$('prop_copyright').checked=false;
-            	$('prop_copyright').disabled = true;
-	}		
-	$('security').onchange=function(){
-		copyright(copyright_flag);
-		customboxes();
+function setCopyrightEdit(){
+	if($('security') && $('prop_copyright')){
+		var copyright_flag = $('prop_copyright').checked;
+		if($('security').value != 'public'){
+			$('prop_copyright').checked = false;
+			$('prop_copyright').disabled = true;
+		}
+		$('security').onchange = function(){
+			copyright(copyright_flag);
+			customboxes();
+		};
+		$('prop_copyright').onchange = function(){
+			copyright_flag = $('prop_copyright').checked;
+		}
 	}
-	$('prop_copyright').onchange=function(){
-		copyright_flag=$('prop_copyright').checked;
-	}
-     }
 }
 
-function copyright(copyright_flag) {
-    if ($('security') && $('prop_copyright')) {
-        if ($('security').value != "public") {
-            $('prop_copyright').checked = 0;
-            $('prop_copyright').disabled = true;
-	    $('defined_copyright').value = '0';
-        } else {
-            if (Site.default_copyright == "P") {
-                $('prop_copyright').checked = 1;
-            }
-            $('prop_copyright').disabled = false;
-	    $('prop_copyright').checked=copyright_flag;
-	    
-	    $('defined_copyright').value = '1';
-	   
-     	}
+function copyright(copyright_flag){
+	if($('security') && $('prop_copyright')){
+		if($('security').value != "public"){
+			$('prop_copyright').checked = 0;
+			$('prop_copyright').disabled = true;
+			$('defined_copyright').value = '0';
+		} else {
+			if(Site.default_copyright == "P"){
+				$('prop_copyright').checked = 1;
+			}
+			$('prop_copyright').disabled = false;
+			$('prop_copyright').checked = copyright_flag;
 
-    }
+			$('defined_copyright').value = '1';
+
+		}
+
+	}
 }
 
-function altlogin (e) {
-    var agt   = navigator.userAgent.toLowerCase();
-    var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
+function altlogin(e){
+	var agt = navigator.userAgent.toLowerCase();
+	var is_ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1));
 
-    if (! e) var e = window.event;
-    if (! document.getElementById) return false;
-    
-    var altlogin_wrapper = $('altlogin_wrapper');
-    if (! altlogin_wrapper) return false;
-    altlogin_wrapper.style.display = 'block';
-   
-    var remotelogin = $('remotelogin');
-    if (! remotelogin) return false;
-    remotelogin.style.display = 'none';
-    
-    var usejournal_list = $('usejournal_list');
-    if (usejournal_list) {
-        usejournal_list.style.display = 'none';
-    }
+	if(! e){
+		e = window.event;
+	}
+	if(! document.getElementById){
+		return false;
+	}
 
-    var readonly = $('readonly');
-    var userbox = f.user;
-    if (!userbox.value && readonly) {
-        readonly.style.display = 'none';
-    }
+	var altlogin_wrapper = $('altlogin_wrapper');
+	if(! altlogin_wrapper){
+		return false;
+	}
+	altlogin_wrapper.style.display = 'block';
 
-    var userpic_list = $('userpic_select_wrapper');
-    if (userpic_list) {
-        userpic_list.style.display = 'none';
-    }
+	var remotelogin = $('remotelogin');
+	if(! remotelogin){
+		return false;
+	}
+	remotelogin.style.display = 'none';
 
-    var userpic_preview = $('userpic_preview');
-    if (userpic_preview) {
-        userpic_preview.className = "";
-        userpic_preview.innerHTML = "<img src='/img/userpic_loggedout.gif' alt='selected userpic' id='userpic_preview_image' class='userpic_loggedout' />";
-    }
+	var usejournal_list = $('usejournal_list');
+	if(usejournal_list){
+		usejournal_list.style.display = 'none';
+	}
 
-    var mood_preview = $('mood_preview');
-    mood_preview.style.display = 'none';
+	var readonly = $('readonly');
+	var userbox = f.user;
+	if(!userbox.value && readonly){
+		readonly.style.display = 'none';
+	}
 
-    f = document.updateForm;
-    if (! f) return false;
-    f.action = 'update.bml?altlogin=1';
-    
-    var custom_boxes = $('custom_boxes');
-    if (! custom_boxes) return false;
-    custom_boxes.style.display = 'none';
-    if (f.security) {
-        f.security.options[3] = null;
-    }
-    
-    f.security.selectedIndex = 0;
+	var userpic_list = $('userpic_select_wrapper');
+	if(userpic_list){
+		userpic_list.style.display = 'none';
+	}
 
-    if (e) {
-        e.cancelBubble = true;
-        if (e.stopPropagation) e.stopPropagation();
-    }
+	var userpic_preview = $('userpic_preview');
+	if(userpic_preview){
+		userpic_preview.className = "";
+		userpic_preview
+			.innerHTML = "<img src='/img/userpic_loggedout.gif' alt='selected userpic' id='userpic_preview_image' class='userpic_loggedout' />";
+	}
 
-    changeSubmit('Post to Journal', null, 'Post to Journal');
+	var mood_preview = $('mood_preview');
+	mood_preview.style.display = 'none';
 
-    if ($('usejournal_username')) {
-        changeSecurityOptions($('usejournal_username').value);
-    } else {
-        changeSecurityOptions('');
-    }
+	f = document.updateForm;
+	if(! f){
+		return false;
+	}
+	f.action = 'update.bml?altlogin=1';
 
-    return false;    
+	var custom_boxes = $('custom_boxes');
+	if(! custom_boxes){
+		return false;
+	}
+	custom_boxes.style.display = 'none';
+	if(f.security){
+		f.security.options[3] = null;
+	}
+
+	f.security.selectedIndex = 0;
+
+	if(e){
+		e.cancelBubble = true;
+		if(e.stopPropagation){
+			e.stopPropagation();
+		}
+	}
+
+	changeSubmit('Post to Journal', null, 'Post to Journal');
+
+	if($('usejournal_username')){
+		changeSecurityOptions($('usejournal_username').value);
+	} else {
+		changeSecurityOptions('');
+	}
+
+	return false;
 }
 
-function insertFormHints() {
-    return;
-    // remove this function after changes to weblib.pl go live
+function insertFormHints(){
+	return;
+	// remove this function after changes to weblib.pl go live
 }
 
-function defaultDate() {
-    $('currentdate').style.display = 'block';
-    $('modifydate').style.display = 'none';
+function defaultDate(){
+	$('currentdate').style.display = 'block';
+	$('modifydate').style.display = 'none';
 }
 
-function insertViewThumbs() {
-    var lj_userpicselect = $('lj_userpicselect');
-    lj_userpicselect.innerHTML = 'View Thumbnails';
+function insertViewThumbs(){
+	var lj_userpicselect = $('lj_userpicselect');
+	lj_userpicselect.innerHTML = 'View Thumbnails';
 }
 
-function mood_preview() {
-    if (! document.getElementById) return false;
-    var mood_list  = document.getElementById('prop_current_moodid'); // get select
-    var moodid = mood_list[mood_list.selectedIndex].value; // get value of select
-    var moodPreview;
+function mood_preview(){
+	if(! document.getElementById){
+		return false;
+	}
+	var mood_list = document.getElementById('prop_current_moodid'); // get select
+	var moodid = mood_list[mood_list.selectedIndex].value; // get value of select
+	var moodPreview;
 
-    if (moodid == "") {
-        if ($('mood_preview')) {
-            moodPreview = $('mood_preview');
-            moodPreview.innerHTML = '';         
-        }
-        return false
-    } else {
-        var wrapper = $('entryform-mood-wrapper');
-        if ($('mood_preview')) {
-            moodPreview = $('mood_preview');
-            moodPreview.innerHTML = '';
-        } else {
-            moodPreview = document.createElement('span');
-            moodPreview.id = 'mood_preview';
-            wrapper.appendChild(moodPreview);
-        } 
-        var moodPreviewImage = document.createElement('img');
-        moodPreviewImage.id = 'mood_image_preview';
-        moodPreviewImage.src = moodpics[moodid];
-        var moodPreviewText = document.createElement('span');
-        moodPreviewText.id = 'mood_text_preview';
-        var mood_custom_text  = $('prop_current_mood').value;
-        moodPreviewText.innerHTML = mood_custom_text == "" ? moods[moodid] : mood_custom_text;
-        moodPreview.appendChild(moodPreviewImage);
-        moodPreview.appendChild(moodPreviewText);
-        if (moodPreview.style.display != 'none') {
-            $('prop_current_music').className = $('prop_current_music').className + ' narrow';
-            $('prop_current_location').className = $('prop_current_location').className + ' narrow';
-        }
-    }
+	if(moodid == ""){
+		if($('mood_preview')){
+			moodPreview = $('mood_preview');
+			moodPreview.innerHTML = '';
+		}
+		return false
+	} else {
+		var wrapper = $('entryform-mood-wrapper');
+		if($('mood_preview')){
+			moodPreview = $('mood_preview');
+			moodPreview.innerHTML = '';
+		} else {
+			moodPreview = document.createElement('span');
+			moodPreview.id = 'mood_preview';
+			wrapper.appendChild(moodPreview);
+		}
+		var moodPreviewImage = document.createElement('img');
+		moodPreviewImage.id = 'mood_image_preview';
+		moodPreviewImage.src = moodpics[moodid];
+		var moodPreviewText = document.createElement('span');
+		moodPreviewText.id = 'mood_text_preview';
+		var mood_custom_text = $('prop_current_mood').value;
+		moodPreviewText.innerHTML = mood_custom_text == "" ? moods[moodid] : mood_custom_text;
+		moodPreview.appendChild(moodPreviewImage);
+		moodPreview.appendChild(moodPreviewText);
+		if(moodPreview.style.display != 'none'){
+			$('prop_current_music').className = $('prop_current_music').className + ' narrow';
+			$('prop_current_location').className = $('prop_current_location').className + ' narrow';
+		}
+	}
 }
 
-function entryPreview(entryForm) {
-    var f=entryForm,
-		action=f.action;
-	f.onsubmit && f.onsubmit(); // for rich editor, syn content
-    f.action='/preview/entry.bml'; 
-    f.target='preview';
-    window.open('','preview','width=760,height=600,resizable=yes,status=yes,toolbar=no,location=no,menubar=no,scrollbars=yes');
-    f.submit(); 
-    f.action=action; 
-    f.target='_self'; 
-    return false;
+function entryPreview(entryForm){
+	var action = entryForm.action;
+	entryForm.onsubmit && entryForm.onsubmit(); // for rich editor, syn content
+	entryForm.action = '/preview/entry.bml';
+	entryForm.target = 'preview';
+	window
+		.open('', 'preview', 'width=760,height=600,resizable=yes,status=yes,toolbar=no,location=no,menubar=no,scrollbars=yes');
+	entryForm.submit();
+	entryForm.action = action;
+	entryForm.target = '_self';
+	return false;
 }
 
-function numberOfColumns(items) {
-    if (items <= 6) { return 1 }
-    else if (items >= 7 && items <= 12) { return 2 }
-    else if (items >= 13 && items <= 18) { return 3 }
-    else { return 4 }
+function numberOfColumns(items){
+	if(items <= 6){
+		return 1
+	} else if(items >= 7 && items <= 12){
+		return 2
+	} else if(items >= 13 && items <= 18){
+		return 3
+	} else {
+		return 4
+	}
 }
-function setColumns(number) {
-    // we'll create all our variables here
-    // if you want to change the names of any of the ids, change them here
-    var listObj = document.getElementById('custom_boxes_list');                  // the actual ul
-    var listWrapper = document.getElementById('custom_boxes');      // ul wrapper
-    var listContainer = document.getElementById('list-container');  // container for dynamic content
+function setColumns(number){
+	// we'll create all our variables here
+	// if you want to change the names of any of the ids, change them here
+	var listObj = document.getElementById('custom_boxes_list');                  // the actual ul
+	var listWrapper = document.getElementById('custom_boxes');      // ul wrapper
+	var listContainer = document.getElementById('list-container');  // container for dynamic content
 
-    // create an array of all the LIs in the UL
-    // or return if we have no custom groups
-    if (listObj) {
-        var theList = listObj.getElementsByTagName('LI');
-    } else {
-        return;
-    }
+	// create an array of all the LIs in the UL
+	// or return if we have no custom groups
+	if(listObj){
+		var theList = listObj.getElementsByTagName('LI');
+	} else {
+		return;
+	}
 
-    if (!listContainer) {   // if div#list-container doesn't exist create it
-        var listContainer = document.createElement('div');
-        listContainer.setAttribute('id','list-container');
-        listWrapper.appendChild(listContainer);
-    } else {                // if it does exist, clear out any content
-        listContainer.innerHTML = '';
-    }
+	if(!listContainer){	 // if div#list-container doesn't exist create it
+		var listContainer = document.createElement('div');
+		listContainer.setAttribute('id', 'list-container');
+		listWrapper.appendChild(listContainer);
+	} else {								// if it does exist, clear out any content
+		listContainer.innerHTML = '';
+	}
 
-    // create and populate content arrays based on ul#list
-    var content = new Array();
-    var contentClass = new Array();
-    var contentId = new Array();
-    for (i=0;i<theList.length;i++) {
-        content[i] = theList[i].innerHTML;
-        contentClass[i] = theList[i].className;
-        contentId[i] = theList[i].id;
-    }
+	// create and populate content arrays based on ul#list
+	var content = new Array();
+	var contentClass = new Array();
+	var contentId = new Array();
+	for(i = 0; i < theList.length; i++){
+		content[i] = theList[i].innerHTML;
+		contentClass[i] = theList[i].className;
+		contentId[i] = theList[i].id;
+	}
 
-    // hide original list
-    listObj.style.display = 'none';
-    
-    // determine number of columns
-    if (number) {   // if it's passed as an argument
-        var columns = number;
-    } else {        // or use the numberOfColumns function to set it
-        var columns = numberOfColumns(content.length);
-    }
+	// hide original list
+	listObj.style.display = 'none';
 
-    // divide number of items by columns and round up to get the number of items per column
-    var perColumn = Math.ceil(content.length / columns);
+	// determine number of columns
+	if(number){	 // if it's passed as an argument
+		var columns = number;
+	} else {				// or use the numberOfColumns function to set it
+		var columns = numberOfColumns(content.length);
+	}
 
-    // set the class of list-wrapper to reflect the number of columns
-    if ((theList.length / perColumn) <= (columns - 1)) {
-        // If the number of items divided by the calculated items per column is less than 
-        // the number of columns minus one, the number of columns will be adjusted down by one. 
-        // In other words, if you have 9 items and try to break them into 4 columns, the last 
-        // column would be empty, so I've made the adjustment automatic.
-        columns = columns - 1;
-    }
-    listWrapper.className = 'columns' + columns;
+	// divide number of items by columns and round up to get the number of items per column
+	var perColumn = Math.ceil(content.length / columns);
 
-    for (j=0;j<columns;j++) { // insert columns into list-container
-        if ((perColumn * j) >= theList.length) return false;
+	// set the class of list-wrapper to reflect the number of columns
+	if((theList.length / perColumn) <= (columns - 1)){
+		// If the number of items divided by the calculated items per column is less than
+		// the number of columns minus one, the number of columns will be adjusted down by one.
+		// In other words, if you have 9 items and try to break them into 4 columns, the last
+		// column would be empty, so I've made the adjustment automatic.
+		columns = columns - 1;
+	}
+	listWrapper.className = 'columns' + columns;
 
-        var columnCounter = j + 1; // add 1 to give logical ids to ULs
-        var ulist = document.createElement('ul');
-        // ulist.setAttribute('class','column');
-        // ulist.setAttribute('id','column-' + columnCounter);
-        listContainer.appendChild(ulist);
-        var start = perColumn * j;      // set where the for loop will start
-        var end = perColumn * (j+1);    // set where the for loop will end
-        for (k=start;k<end;k++) {
-            if (content[k]) {
-                var listitem = document.createElement('li');
-                listitem.setAttribute('class', contentClass[k]);
-                listitem.setAttribute('id', contentId[k]);
-                listitem.innerHTML = content[k];
-                ulist.appendChild(listitem);
-            }
-        }
-    }
-    listWrapper.removeChild(listObj);
+	for(j = 0; j < columns; j++){ // insert columns into list-container
+		if((perColumn * j) >= theList.length){
+			return false;
+		}
+
+		var columnCounter = j + 1; // add 1 to give logical ids to ULs
+		var ulist = document.createElement('ul');
+		// ulist.setAttribute('class','column');
+		// ulist.setAttribute('id','column-' + columnCounter);
+		listContainer.appendChild(ulist);
+		var start = perColumn * j;      // set where the for loop will start
+		var end = perColumn * (j + 1);    // set where the for loop will end
+		for(k = start; k < end; k++){
+			if(content[k]){
+				var listitem = document.createElement('li');
+				listitem.setAttribute('class', contentClass[k]);
+				listitem.setAttribute('id', contentId[k]);
+				listitem.innerHTML = content[k];
+				ulist.appendChild(listitem);
+			}
+		}
+	}
+	listWrapper.removeChild(listObj);
 }
 
-function settime() {
-    function twodigit (n) {
-        if (n < 10) { return "0" + n; }
-        else { return n; }
-    }
-    
-    now = new Date();
-    if (! now) return false;
-    f = document.updateForm;
-    if (! f) return false;
-    
-    f.date_ymd_yyyy.value = now.getYear() < 1900 ? now.getYear() + 1900 : now.getYear();
-    f.date_ymd_mm.selectedIndex = twodigit(now.getMonth());
-    f.date_ymd_dd.value = twodigit(now.getDate());
-    f.hour.value = twodigit(now.getHours());
-    f.min.value = twodigit(now.getMinutes());
+function settime(){
+	function twodigit(n){
+		if(n < 10){
+			return "0" + n;
+		} else {
+			return n;
+		}
+	}
 
-    f.date_diff.value = 1;
+	now = new Date();
+	if(! now){
+		return false;
+	}
+	f = document.updateForm;
+	if(! f){
+		return false;
+	}
 
-    var mNames = new Array("January", "February", "March", 
-        "April", "May", "June", "July", "August", "September", 
-        "October", "November", "December");
-    var currentdate = document.getElementById('currentdate-date');
-    var cMonth = now.getMonth();
-    var cDay = now.getDate();
-    var cYear = now.getYear() < 1900 ? now.getYear() + 1900 : now.getYear();
-    var cHour = now.getHours();
-    var cMinute = twodigit(now.getMinutes());
-    currentdate.innerHTML = mNames[cMonth] + " " + cDay + ", " + cYear + ", " + cHour + ":" + cMinute;
-    
-    return false;
+	f.date_ymd_yyyy.value = now.getYear() < 1900 ? now.getYear() + 1900 : now.getYear();
+	f.date_ymd_mm.selectedIndex = twodigit(now.getMonth());
+	f.date_ymd_dd.value = twodigit(now.getDate());
+	f.hour.value = twodigit(now.getHours());
+	f.min.value = twodigit(now.getMinutes());
+
+	f.date_diff.value = 1;
+
+	var mNames = new Array("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December");
+	var currentdate = document.getElementById('currentdate-date');
+	var cMonth = now.getMonth();
+	var cDay = now.getDate();
+	var cYear = now.getYear() < 1900 ? now.getYear() + 1900 : now.getYear();
+	var cHour = now.getHours();
+	var cMinute = twodigit(now.getMinutes());
+	currentdate.innerHTML = mNames[cMonth] + " " + cDay + ", " + cYear + ", " + cHour + ":" + cMinute;
+
+	return false;
 }
 
-function tagAutocomplete(node, tags)
-{
+function tagAutocomplete(node, tags){
 	var searched;
-	
+
 	jQuery(node).autocomplete({
 		minLength: 1,
-		source: function(request, response) {
+		source: function(request, response){
 			var val = this.element.context.value,
 				range = DOM.getSelectedRange(this.element.context);
-			
-			if (!val || range.start != range.end) {
+
+			if(!val || range.start != range.end){
 				response([]);
 				return;
 			}
-			
+
 			// search one tag
-			searched = val.match(new RegExp('(^.{0,'+(range.start - 1)+'},|^)([^,]*),?(.*)'))
+			searched = val.match(new RegExp('(^.{0,' + (range.start - 1) + '},|^)([^,]*),?(.*)'));
 			var tag = searched[2].replace(/^ +/, '');
 			// delegate back to autocomplete, but extract term
-			if (!tag) {
+			if(!tag){
 				response([]);
 				return;
 			}
 			var resp_ary = [], i = -1;
-			while (tags[++i]) {
-				if (tags[i].indexOf(tag) === 0) {
+			while(tags[++i]){
+				if(tags[i].indexOf(tag) === 0){
 					resp_ary.push(tags[i]);
-					if (resp_ary.length === 10) {
+					if(resp_ary.length === 10){
 						break;
 					}
 				}
 			}
-			
+
 			response(resp_ary);
 		},
-		focus: function() {
+		focus: function(){
 			// prevent value inserted on focus
 			return false;
 		},
-		select: function(e, ui) {
+		select: function(e, ui){
 			ui.item.value += ',';
-			
-			if (searched[1].length) { // no start
+
+			if(searched[1].length){ // no start
 				ui.item.value = ' ' + ui.item.value;
 			}
 			var new_range = searched[1].length + ui.item.value.length;
-			if (!searched[3].length) { // empy in end
+			if(!searched[3].length){ // empy in end
 				ui.item.value += ' ';
 				new_range++;
 			} else { // set range before ", ..."
 				new_range--;
 			}
-			
+
 			this.value = searched[1] + ui.item.value + searched[3];
 			DOM.setSelectedRange(this, new_range, new_range);
-			
+
 			e.preventDefault();
 		},
-		
-		open: function()
-		{
-			var widget = jQuery(this).autocomplete('widget')
+
+		open: function(){
+			var widget = jQuery(this).autocomplete('widget');
 			// fix left pos in FF 3.6
-			if (jQuery.browser.mozilla) {
+			if(jQuery.browser.mozilla){
 				var offset = widget.offset();
 				offset.left++;
-				
+
 				widget.offset(offset);
-				widget.width(widget.width()+3);
+				widget.width(widget.width() + 3);
 			} else {
-				widget.width(widget.width()+4);
+				widget.width(widget.width() + 4);
 			}
 		}
 	});
 }
 
-function getUserTags(user)
-{
+function getUserTags(user){
 	user = user || Site.currentJournal;
-	
+
 	jQuery('#prop_taglist').autocomplete('destroy');
-	
-	if (journalTags[user]) {
+
+	if(journalTags[user]){
 		tagAutocomplete($('prop_taglist'), journalTags[user]);
 	} else {
-		jQuery.getJSON(
-			'/tools/endpoints/gettags.bml?user=' + user,
-			function(data) {
-				if (data.tags) {
-					tagAutocomplete($('prop_taglist'), data.tags);
-				}
-			});
+		jQuery.getJSON('/tools/endpoints/gettags.bml?user=' + user, function(data){
+			if(data.tags){
+				tagAutocomplete($('prop_taglist'), data.tags);
+			}
+		});
 	}
 }
 
-function selectTags(node)
-{
+function selectTags(node){
 	var widget = new LJWidgetIPPU();
-	
-	widget.onRefresh = function()
-	{
+
+	widget.onRefresh = function(){
 		IPPUSelectTags.widget = widget;
 		IPPUSelectTags.init();
-	}
-	
+	};
+
 	widget.init({
-			title: node.firstChild.nodeValue,
-			height: 329,
-			width: jQuery(window).width()/2,
-			widgetClass: 'IPPU::SelectTags'
-		} , {
-			user: jQuery(document.forms.updateForm.usejournal).val()
-		});
+		title: node.firstChild.nodeValue,
+		height: 329,
+		width: jQuery(window).width() / 2,
+		widgetClass: 'IPPU::SelectTags'
+	}, {
+		user: jQuery(document.forms.updateForm.usejournal).val()
+	});
 	widget.ippu.addClass('ippu-select-tags');
 	widget.ippu.setClickToClose(false);
-	
+
 	return false;
 }
 
+IPPUSelectTags = {
+	init: function(ippu_node){
+		$('selecttags-all').value = $('prop_taglist').value.split(/ *, */).join(', ');
 
-IPPUSelectTags =
-{
-	init: function(ippu_node)
-	{
-		$('selecttags-all').value = $('prop_taglist').value.split(/ *, */).join(', ');
-		
 		this.checkboxes = jQuery('div.b-selecttags-tags input:checkbox', ippu_node);
-		
-		jQuery('#selecttags-all')
-			.input(this.input)
-			.input();
+
+		jQuery('#selecttags-all').input(this.input).input();
 	},
-	
-	change: function(node)
-	{
+
+	change: function(node){
 		var inp = $('selecttags-all'),
 			ary = inp.value.replace(/ */, '') ? inp.value.split(/ *, */) : [],
 			i = -1;
 
-		ary = jQuery.map( ary, function (val, idx) { return (val.length > 0) ? val : null } );
-		if (node.checked) {
+		ary = jQuery.map(ary, function (val, idx){
+			return (val.length > 0) ? val : null
+		});
+		if(node.checked){
 			ary.push(node.value)
 		} else {
-			while (ary[++i]) {
-				if (ary[i] == node.value) {
+			while(ary[++i]){
+				if(ary[i] == node.value){
 					ary.splice(i, 1);
 					break;
 				}
 			}
 		}
-		
+
 		inp.value = ary.join(', ');
 	},
-	
-	input: function()
-	{
+
+	input: function(){
 		var ary = $('selecttags-all').value.split(/ *, */),
-		    checkboxes = IPPUSelectTags.checkboxes;
-		ary = jQuery.map( ary, function (val, idx) { return (val.length > 0) ? val : null } );
+			checkboxes = IPPUSelectTags.checkboxes;
+		ary = jQuery.map(ary, function (val, idx){
+			return (val.length > 0) ? val : null
+		});
 		checkboxes.attr('checked', false);
-		while(ary.length) checkboxes.filter('[value='+ary.pop()+']').attr('checked', true);
+		while(ary.length){
+			checkboxes.filter('[value=' + ary.pop() + ']').attr('checked', true);
+		}
 	},
-	
-	save_click: function()
-	{
+
+	save_click: function(){
 		$('prop_taglist').value = $('selecttags-all').value.split(/ *, */).join(', ');
 		this.widget.close();
 	},
-	
-	reset_click: function()
-	{
+
+	reset_click: function(){
 		$('selecttags-all').value = '';
 		IPPUSelectTags.checkboxes.attr('checked', false);
 	}
-}
+};
 
-function _changeOptionState(option, enable) {
-    if (option) {
-        if (enable) {
-            option.disabled = false;
-            option.style.color = "";
-        } else {
-            option.disabled = true;
-            option.style.color = "#999";
-        }
-    }
+function _changeOptionState(option, enable){
+	if(option){
+		if(enable){
+			option.disabled = false;
+			option.style.color = "";
+		} else {
+			option.disabled = true;
+			option.style.color = "#999";
+		}
+	}
 }
 
-function changeSecurityOptions(user)
-{
+function changeSecurityOptions(user){
 	user = user || Site.currentJournal;
 
-    HTTPReq.getJSON({
-        url: "/tools/endpoints/getsecurityoptions.bml?user=" + user,
-        method: "GET",
-        onData: function (data) {
-            if ($('security')) {
-                // first empty out whatever is in the drop-down
-		var prev_security=$('security').selectedIndex;
-                for (i = 0; i < $('security').options.length; i++){
-                    $('security').options[i] = null;
-                }
+	HTTPReq.getJSON({
+		url: "/tools/endpoints/getsecurityoptions.bml?user=" + user,
+		method: "GET",
+		onData: function (data){
+			if($('security')){
+				// first empty out whatever is in the drop-down
+				var prev_security = $('security').selectedIndex;
+				for(i = 0; i < $('security').options.length; i++){
+					$('security').options[i] = null;
+				}
 
-                // if the user is known
-                if (data.ret) {
-                    // give the appropriate security options for the account type
-                    if (data.ret['is_comm']) {
-                        $('security').options[0] = new Option(UpdateFormStrings.public, 'public');
-                        $('security').options[1] = new Option(UpdateFormStrings.friends_comm, 'friends');
-			if(prev_security>$('security').options.length-1){prev_security=$('security').options.length-1;}
-                    } else {
-                        $('security').options[0] = new Option(UpdateFormStrings.public, 'public');
-                        $('security').options[1] = new Option(UpdateFormStrings.friends, 'friends');
-                        $('security').options[2] = new Option(UpdateFormStrings.private, 'private');
-                        if (data.ret['friend_groups_exist']) {
-                            $('security').options[3] = new Option(UpdateFormStrings.custom, 'custom');
-                        }
-                    }
+				// if the user is known
+				if(data.ret){
+					// give the appropriate security options for the account type
+					if(data.ret['is_comm']){
+						$('security').options[0] = new Option(UpdateFormStrings.public, 'public');
+						$('security').options[1] = new Option(UpdateFormStrings.friends_comm, 'friends');
+						if(prev_security > $('security').options.length - 1){
+							prev_security = $('security').options.length - 1;
+						}
+					} else {
+						$('security').options[0] = new Option(UpdateFormStrings.public, 'public');
+						$('security').options[1] = new Option(UpdateFormStrings.friends, 'friends');
+						$('security').options[2] = new Option(UpdateFormStrings.private, 'private');
+						if(data.ret['friend_groups_exist']){
+							$('security').options[3] = new Option(UpdateFormStrings.custom, 'custom');
+						}
+					}
 
-                    // select the minsecurity value and disable the values with lesser security
-                    if (data.ret['minsecurity'] == "friends") {
-                        $('security').selectedIndex = Math.max(1,prev_security);
-                        _changeOptionState($('security').options[0], false);
-                    } else if (data.ret['minsecurity'] == "private") {
-                        $('security').selectedIndex = Math.max(2,prev_security);
-                        _changeOptionState($('security').options[0], false);
-                        _changeOptionState($('security').options[1], false);
-                        _changeOptionState($('security').options[3], false);
-                    } else {
-                        $('security').selectedIndex = Math.max(0,prev_security);
-                        _changeOptionState($('security').options[0], true);
-                        _changeOptionState($('security').options[1], true);
-                        _changeOptionState($('security').options[2], true);
-                        _changeOptionState($('security').options[3], true);
-                    }
+					// select the minsecurity value and disable the values with lesser security
+					if(data.ret['minsecurity'] == "friends"){
+						$('security').selectedIndex = Math.max(1, prev_security);
+						_changeOptionState($('security').options[0], false);
+					} else if(data.ret['minsecurity'] == "private"){
+						$('security').selectedIndex = Math.max(2, prev_security);
+						_changeOptionState($('security').options[0], false);
+						_changeOptionState($('security').options[1], false);
+						_changeOptionState($('security').options[3], false);
+					} else {
+						$('security').selectedIndex = Math.max(0, prev_security);
+						_changeOptionState($('security').options[0], true);
+						_changeOptionState($('security').options[1], true);
+						_changeOptionState($('security').options[2], true);
+						_changeOptionState($('security').options[3], true);
+					}
 
-                    // remove custom friends groups boxes if needed
-                    customboxes();
+					// remove custom friends groups boxes if needed
+					customboxes();
 
-                // if the user is not known
-                } else {
-                    // personal journal, but no custom option, and no minsecurity
-                    $('security').options[0] = new Option(UpdateFormStrings.public, 'public');
-                    $('security').options[1] = new Option(UpdateFormStrings.friends, 'friends');
-                    $('security').options[2] = new Option(UpdateFormStrings.private, 'private');
-                    $('security').selectedIndex = 0;
-                    _changeOptionState($('security').options[0], true);
-                    _changeOptionState($('security').options[1], true);
-                    _changeOptionState($('security').options[2], true);
-                }
-            }
-        },
-        onError: function (msg) { }
-    });
+					// if the user is not known
+				} else {
+					// personal journal, but no custom option, and no minsecurity
+					$('security').options[0] = new Option(UpdateFormStrings.public, 'public');
+					$('security').options[1] = new Option(UpdateFormStrings.friends, 'friends');
+					$('security').options[2] = new Option(UpdateFormStrings.private, 'private');
+					$('security').selectedIndex = 0;
+					_changeOptionState($('security').options[0], true);
+					_changeOptionState($('security').options[1], true);
+					_changeOptionState($('security').options[2], true);
+				}
+			}
+		},
+		onError: function (msg){
+		}
+	});
 }
 
 ///////////////////// Insert Object code
 
 var InOb = new Object;
 
-InOb.fail = function (msg) {
-    alert("FAIL: " + msg);
-    return false;
+InOb.fail = function (msg){
+	alert("FAIL: " + msg);
+	return false;
 };
 
 // image upload stuff
-InOb.onUpload = function (surl, furl, swidth, sheight) {
-    var ta = $("updateForm");
-    if (! ta) return InOb.fail("no updateform");
-    ta = ta.event;
-    ta.value = ta.value + "\n<a href=\"" + furl + "\"><img src=\"" + surl + "\" width=\"" + swidth + "\" height=\"" + sheight + "\" border='0'/></a>";
+InOb.onUpload = function (surl, furl, swidth, sheight){
+	var ta = $("updateForm");
+	if(! ta){
+		return InOb.fail("no updateform");
+	}
+	ta = ta.event;
+	ta.value = ta
+		.value + "\n<a href=\"" + furl + "\"><img src=\"" + surl + "\" width=\"" + swidth + "\" height=\"" + sheight + "\" border='0'/></a>";
 };
 
-
-InOb.onInsURL = function (url, width, height) {
-        var ta = $("updateForm");
-        var fail = function (msg) {
-            alert("FAIL: " + msg);
-            return 0;
-        };
-        if (! ta) return fail("no updateform");
-        var w = '';
-        var h = '';
-        if (width > 0) w = " width='" + width + "'";
-        if (height > 0) h = " height='" + height + "'";
-        ta = ta.event;
-        ta.value = ta.value + "\n<img src=\"" + url + "\"" + w + h + " />";
-        return true;
+InOb.onInsURL = function (url, width, height){
+	var ta = $("updateForm");
+	var fail = function (msg){
+		alert("FAIL: " + msg);
+		return 0;
+	};
+	if(! ta){
+		return fail("no updateform");
+	}
+	var w = '';
+	var h = '';
+	if(width > 0){
+		w = " width='" + width + "'";
+	}
+	if(height > 0){
+		h = " height='" + height + "'";
+	}
+	ta = ta.event;
+	ta.value = ta.value + "\n<img src=\"" + url + "\"" + w + h + " />";
+	return true;
 };
 
-
 var currentPopup;        // set when we make the iframe
 var currentPopupWindow;  // set when the iframe registers with us and we setup its handlers
-function onInsertObject (include) {
-    InOb.onClosePopup();
+function onInsertObject(include){
+	InOb.onClosePopup();
 
-    //var iframe = document.createElement("iframe");
-    var iframe = document.createElement("div");
-    iframe.id = "updateinsobject";
-    iframe.className = 'updateinsobject';
-    iframe.style.overflow = "hidden";
-    iframe.style.position = "absolute";
-    iframe.style.border = "0";
-    iframe.style.backgroundColor = "#fff";
+	//var iframe = document.createElement("iframe");
+	var iframe = document.createElement("div");
+	iframe.id = "updateinsobject";
+	iframe.className = 'updateinsobject';
+	iframe.style.overflow = "hidden";
+	iframe.style.position = "absolute";
+	iframe.style.border = "0";
+	iframe.style.backgroundColor = "#fff";
 	iframe.style.zIndex = 1000;
 
-    //iframe.src = include;
-    iframe.innerHTML = "<iframe id='popupsIframe' style='border:none' frameborder='0' width='100%' height='100%' src='" + include + "'></iframe>";
+	//iframe.src = include;
+	iframe
+		.innerHTML = "<iframe id='popupsIframe' style='border:none' frameborder='0' width='100%' height='100%' src='" + include + "'></iframe>";
 
-    document.body.appendChild(iframe);
-    currentPopup = iframe;
-    setTimeout(function () { document.getElementById('popupsIframe').setAttribute('src', include); }, 500);
-    InOb.smallCenter();
-	InOb.onresize = function() { return InOb.smallCenter(); }
-	
+	document.body.appendChild(iframe);
+	currentPopup = iframe;
+	setTimeout(function (){
+		document.getElementById('popupsIframe').setAttribute('src', include);
+	}, 500);
+	InOb.smallCenter();
+	InOb.onresize = function(){
+		return InOb.smallCenter();
+	};
+
 	jQuery(window).resize(InOb.resize);
 }
 // the select's onchange:
-InOb.handleInsertSelect = function () {
-    var objsel = $('insobjsel');
-    if (! objsel) { return InOb.fail('can\'t get insert select'); }
+InOb.handleInsertSelect = function (){
+	var objsel = $('insobjsel');
+	if(! objsel){
+		return InOb.fail('can\'t get insert select');
+	}
 
-    var selected = objsel.selectedIndex;
-    var include;
+	var selected = objsel.selectedIndex;
+	var include;
 
-    objsel.selectedIndex = 0;
+	objsel.selectedIndex = 0;
 
-    if (selected == 0) {
-        return true;
-    } else if (selected == 1) {
-        include = 'imgupload.bml';
-    } else {
-        alert('Unknown index selected');
-        return false;
-    }
+	if(selected == 0){
+		return true;
+	} else if(selected == 1){
+		include = 'imgupload.bml';
+	} else {
+		alert('Unknown index selected');
+		return false;
+	}
 
-    onInsertObject(include);
+	onInsertObject(include);
 
-    return true;
+	return true;
 };
 
-entry_insert_embed = function (cb) {
-    var prompt = "Add media from other websites by copying and pasting their embed code here. ";
-    LJ_IPPU.textPrompt("Insert Embedded Content", prompt, cb);
+entry_insert_embed = function (cb){
+	var prompt = "Add media from other websites by copying and pasting their embed code here. ";
+	LJ_IPPU.textPrompt("Insert Embedded Content", prompt, cb);
 };
 
-InOb.handleInsertEmbed = function () {
-    var cb = function (content) {
-        var form = $("updateForm");
-        if (! form || ! form.event);
-        form.event.value += "\n<lj-embed>\n" + content + "\n</lj-embed>";
-    };
-    entry_insert_embed(cb);
-}
+InOb.handleInsertEmbed = function (){
+	var cb = function (content){
+		var form = $("updateForm");
+		if(! form || ! form.event){
+			;
+		}
+		form.event.value += "\n<lj-embed>\n" + content + "\n</lj-embed>";
+	};
+	entry_insert_embed(cb);
+};
 
-InOb.handleInsertImage = function () {
-    var include;
-    include = '/imgupload.bml';
-    onInsertObject(include);
-    return true;
-}
-InOb.handleInsertVideo = function() {
-    var videoUrl = prompt('Please enter a video URL:');
-    var draft = $('draft');
-    var video = "<lj-template name=\"video\">" + videoUrl + "</lj-template>";
-    draft.value = draft.value + video;
-}
+InOb.handleInsertImage = function (){
+	var include;
+	include = '/imgupload.bml';
+	onInsertObject(include);
+	return true;
+};
+InOb.handleInsertVideo = function(){
+	var videoUrl = prompt('Please enter a video URL:');
+	var draft = $('draft');
+	var video = "<lj-template name=\"video\">" + videoUrl + "</lj-template>";
+	draft.value = draft.value + video;
+};
 
-InOb.resize = function()
-{
+InOb.resize = function(){
 	InOb.onresize();
-}
+};
 
-InOb.onClosePopup = function () {
-    if (! currentPopup) return;
-    document.body.removeChild(currentPopup);
+InOb.onClosePopup = function (){
+	if(! currentPopup){
+		return;
+	}
+	document.body.removeChild(currentPopup);
 
 	jQuery(window).unbind('resize', InOb.resize);
-    currentPopup = null;
+	currentPopup = null;
 };
 
-InOb.setupIframeHandlers = function () {
-    var ife = $("popupsIframe");  //currentPopup;
-    if (! ife) { return InOb.fail('handler without a popup?'); }
-    var ifw = ife.contentWindow;
-    currentPopupWindow = ifw;
-    if (! ifw) return InOb.fail("no content window?");
+InOb.setupIframeHandlers = function (){
+	var ife = $("popupsIframe");  //currentPopup;
+	if(! ife){
+		return InOb.fail('handler without a popup?');
+	}
+	var ifw = ife.contentWindow;
+	currentPopupWindow = ifw;
+	if(! ifw){
+		return InOb.fail("no content window?");
+	}
 
-    var el;
+	var el;
 
-    el = ifw.document.getElementById("fromurl");
-    if (el) el.onclick = function () { return InOb.selectRadio("fromurl"); };
-    el = ifw.document.getElementById("fromurlentry");
-    if (el) el.onclick = function () { return InOb.selectRadio("fromurl"); };
-    if (el) el.onkeypress = function () { return InOb.clearError(); };
-    el = ifw.document.getElementById("fromfile");
-    if (el) el.onclick = function () { return InOb.selectRadio("fromfile"); };
-    el = ifw.document.getElementById("fromfileentry");
-    if (el) el.onclick = el.onchange = function () { return InOb.selectRadio("fromfile"); };
-    el = ifw.document.getElementById("fromfb");
-    if (el) el.onclick = function () { return InOb.selectRadio("fromfb"); };
-    el = ifw.document.getElementById("btnPrev");
-    if (el) el.onclick = InOb.onButtonPrevious;
+	el = ifw.document.getElementById("fromurl");
+	if(el){
+		el.onclick = function (){
+			return InOb.selectRadio("fromurl");
+		};
+	}
+	el = ifw.document.getElementById("fromurlentry");
+	if(el){
+		el.onclick = function (){
+			return InOb.selectRadio("fromurl");
+		};
+	}
+	if(el){
+		el.onkeypress = function (){
+			return InOb.clearError();
+		};
+	}
+	el = ifw.document.getElementById("fromfile");
+	if(el){
+		el.onclick = function (){
+			return InOb.selectRadio("fromfile");
+		};
+	}
+	el = ifw.document.getElementById("fromfileentry");
+	if(el){
+		el.onclick = el.onchange = function (){
+			return InOb.selectRadio("fromfile");
+		};
+	}
+	el = ifw.document.getElementById("fromfb");
+	if(el){
+		el.onclick = function (){
+			return InOb.selectRadio("fromfb");
+		};
+	}
+	el = ifw.document.getElementById("btnPrev");
+	if(el){
+		el.onclick = InOb.onButtonPrevious;
+	}
 
 };
 
-InOb.selectRadio = function (which) {
-    if (! currentPopup) { alert('no popup');
-                          alert(window.parent.currentPopup);
- return false; }
-    if (! currentPopupWindow) return InOb.fail('no popup window');
+InOb.selectRadio = function (which){
+	if(! currentPopup){
+		alert('no popup');
+		alert(window.parent.currentPopup);
+		return false;
+	}
+	if(! currentPopupWindow){
+		return InOb.fail('no popup window');
+	}
 
-    var radio = currentPopupWindow.document.getElementById(which);
-    if (! radio) return InOb.fail('no radio button');
-    radio.checked = true;
+	var radio = currentPopupWindow.document.getElementById(which);
+	if(! radio){
+		return InOb.fail('no radio button');
+	}
+	radio.checked = true;
 
-    var fromurl  = currentPopupWindow.document.getElementById('fromurlentry');
-    var fromfile = currentPopupWindow.document.getElementById('fromfileentry');
-    var submit   = currentPopupWindow.document.getElementById('btnNext');
-    if (! submit) return InOb.fail('no submit button');
+	var fromurl = currentPopupWindow.document.getElementById('fromurlentry');
+	var fromfile = currentPopupWindow.document.getElementById('fromfileentry');
+	var submit = currentPopupWindow.document.getElementById('btnNext');
+	if(! submit){
+		return InOb.fail('no submit button');
+	}
 
-    // clear stuff
-    if (which != 'fromurl') {
-        fromurl.value = '';
-    }
+	// clear stuff
+	if(which != 'fromurl'){
+		fromurl.value = '';
+	}
 
-    if (which != 'fromfile') {
-        var filediv = currentPopupWindow.document.getElementById('filediv');
-        filediv.innerHTML = filediv.innerHTML;
-    }
+	if(which != 'fromfile'){
+		var filediv = currentPopupWindow.document.getElementById('filediv');
+		filediv.innerHTML = filediv.innerHTML;
+	}
 
-    // focus and change next button
-    if (which == "fromurl") {
-        submit.value = 'Insert';
-        fromurl.focus();
-    }
+	// focus and change next button
+	if(which == "fromurl"){
+		submit.value = 'Insert';
+		fromurl.focus();
+	}
 
-    else if (which == "fromfile") {
-        submit.value = 'Upload';
-        fromfile.focus();
-    }
+	else if(which == "fromfile"){
+		submit.value = 'Upload';
+		fromfile.focus();
+	}
 
-    else if (which == "fromfb") {
-        submit.value = "Next -->";  // &#x2192 is a right arrow
-        // fromfile.focus();
-    }
+	else if(which == "fromfb"){
+		submit.value = "Next -->";  // &#x2192 is a right arrow
+		// fromfile.focus();
+	}
 
-    return true;
+	return true;
 };
 
 // getElementById
-InOb.popid = function (id) {
-    var popdoc = currentPopupWindow.document;
-    return popdoc.getElementById(id);
+InOb.popid = function (id){
+	var popdoc = currentPopupWindow.document;
+	return popdoc.getElementById(id);
 };
 
-InOb.onSubmit = function () {
-    var fileradio = InOb.popid('fromfile');
-    var urlradio  = InOb.popid('fromurl');
-    var fbradio   = InOb.popid('fromfb');
+InOb.onSubmit = function (){
+	var fileradio = InOb.popid('fromfile');
+	var urlradio = InOb.popid('fromurl');
+	var fbradio = InOb.popid('fromfb');
 
-    var form = InOb.popid('insobjform');
-    if (! form) return InOb.fail('no form');
+	var form = InOb.popid('insobjform');
+	if(! form...
 (truncated)
Tags: b_vladi, bml, js, livejournal, pm
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments