From c21af711e7c227fe773c36247ba36c18923b2b2a Mon Sep 17 00:00:00 2001
From: Ozh <ozh@ozh.org>
Date: Wed, 13 Feb 2013 10:11:50 +0000
Subject: [PATCH] More unique JS function names. Fixes issue 1276. Stupid
 Chrome.

git-svn-id: http://yourls.googlecode.com/svn/trunk@880 12232710-3e20-11de-b438-597f59cd7555
---
 includes/functions-html.php | 10 +++++-----
 js/insert.js                | 32 ++++++++++++++++----------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/includes/functions-html.php b/includes/functions-html.php
index 34b07c0..e1c1a85 100644
--- a/includes/functions-html.php
+++ b/includes/functions-html.php
@@ -171,7 +171,7 @@ function yourls_html_addnew( $url = '', $keyword = '' ) {
 				<div><strong><?php yourls_e( 'Enter the URL' ); ?></strong>:<input type="text" id="add-url" name="url" value="<?php echo $url; ?>" class="text" size="80" />
 				<?php yourls_e( 'Optional '); ?>: <strong><?php yourls_e('Custom short URL'); ?></strong>:<input type="text" id="add-keyword" name="keyword" value="<?php echo $keyword; ?>" class="text" size="8" />
 				<?php yourls_nonce_field( 'add_url', 'nonce-add' ); ?>
-				<input type="button" id="add-button" name="add-button" value="<?php yourls_e( 'Shorten The URL' ); ?>" class="button" onclick="add();" /></div>
+				<input type="button" id="add-button" name="add-button" value="<?php yourls_e( 'Shorten The URL' ); ?>" class="button" onclick="add_link();" /></div>
 			</form>
 			<div id="feedback" style="display:none"></div>
 		</div>
@@ -355,7 +355,7 @@ function yourls_share_box( $longurl, $shorturl, $title = '', $text='', $shortlin
 			<p id="share_links"><?php yourls_e( 'Share with' ); ?> 
 				<a id="share_tw" href="http://twitter.com/home?status=<?php echo $_share; ?>" title="<?php yourls_e( 'Tweet this!' ); ?>" onclick="share('tw');return false">Twitter</a>
 				<a id="share_fb" href="http://www.facebook.com/share.php?u=<?php echo $_url; ?>" title="<?php yourls_e( 'Share on Facebook' ); ?>" onclick="share('fb');return false;">Facebook</a>
-				<a id="share_ff" href="http://friendfeed.com/share/bookmarklet/frame#title=<?php echo $_share; ?>" title="<?php yourls_e( 'Share on Friendfeed' ); ?>" onclick="javascript:share('ff');return false;">FriendFeed</a>
+				<a id="share_ff" href="http://friendfeed.com/share/bookmarklet/frame#title=<?php echo $_share; ?>" title="<?php yourls_e( 'Share on Friendfeed' ); ?>" onclick="share('ff');return false;">FriendFeed</a>
 				<?php
 				yourls_do_action( 'share_links', $longurl, $shorturl, $title, $text );
 				// Note: on the main admin page, there are no parameters passed to the sharebox when it's drawn.
@@ -417,7 +417,7 @@ function yourls_table_edit_row( $keyword ) {
 	
 	if( $url ) {
 		$return = <<<RETURN
-<tr id="edit-$id" class="edit-row"><td colspan="5" class="edit-row"><strong>%s</strong>:<input type="text" id="edit-url-$id" name="edit-url-$id" value="$safe_url" class="text" size="70" /><br/><strong>%s</strong>: $www<input type="text" id="edit-keyword-$id" name="edit-keyword-$id" value="$keyword" class="text" size="10" /><br/><strong>%s</strong>: <input type="text" id="edit-title-$id" name="edit-title-$id" value="$safe_title" class="text" size="60" /></td><td colspan="1"><input type="button" id="edit-submit-$id" name="edit-submit-$id" value="%s" title="%s" class="button" onclick="edit_save('$id');" />&nbsp;<input type="button" id="edit-close-$id" name="edit-close-$id" value="%s" title="%s" class="button" onclick="hide_edit('$id');" /><input type="hidden" id="old_keyword_$id" value="$keyword"/><input type="hidden" id="nonce_$id" value="$nonce"/></td></tr>
+<tr id="edit-$id" class="edit-row"><td colspan="5" class="edit-row"><strong>%s</strong>:<input type="text" id="edit-url-$id" name="edit-url-$id" value="$safe_url" class="text" size="70" /><br/><strong>%s</strong>: $www<input type="text" id="edit-keyword-$id" name="edit-keyword-$id" value="$keyword" class="text" size="10" /><br/><strong>%s</strong>: <input type="text" id="edit-title-$id" name="edit-title-$id" value="$safe_title" class="text" size="60" /></td><td colspan="1"><input type="button" id="edit-submit-$id" name="edit-submit-$id" value="%s" title="%s" class="button" onclick="edit_link_save('$id');" />&nbsp;<input type="button" id="edit-close-$id" name="edit-close-$id" value="%s" title="%s" class="button" onclick="edit_link_hide('$id');" /><input type="hidden" id="old_keyword_$id" value="$keyword"/><input type="hidden" id="nonce_$id" value="$nonce"/></td></tr>
 RETURN;
 		$return = sprintf( urldecode( $return ), yourls__( 'Long URL' ), yourls__( 'Short URL' ), yourls__( 'Title' ), yourls__( 'Save' ), yourls__( 'Save new values' ), yourls__( 'Cancel' ), yourls__( 'Cancel editing' ) );
 	} else {
@@ -469,14 +469,14 @@ function yourls_table_add_row( $keyword, $url, $title = '', $ip, $clicks, $times
 			'id'      => "edit-button-$id",
 			'title'   => yourls_esc_attr__( 'Edit' ),
 			'anchor'  => yourls__( 'Edit' ),
-			'onclick' => "edit('$id');return false;",
+			'onclick' => "edit_link_display('$id');return false;",
 		),
 		'delete' => array(
 			'href'    => $delete_link,
 			'id'      => "delete-button-$id",
 			'title'   => yourls_esc_attr__( 'Delete' ),
 			'anchor'  => yourls__( 'Delete' ),
-			'onclick' => "remove('$id');return false;",
+			'onclick' => "remove_link('$id');return false;",
 		)
 	);
 	$actions = yourls_apply_filter( 'table_add_row_action_array', $actions );
diff --git a/js/insert.js b/js/insert.js
index c00f56d..14c1eb5 100644
--- a/js/insert.js
+++ b/js/insert.js
@@ -1,16 +1,16 @@
 // Init some stuff
 $(document).ready(function(){
 	$('#add-url, #add-keyword').keypress(function(e){
-		if (e.which == 13) {add();}
+		if (e.which == 13) {add_link();}
 	});
-	reset_url();
-	$('#new_url_form').attr('action', 'javascript:add();');
+	add_link_reset();
+	$('#new_url_form').attr('action', 'javascript:add_link();');
 	
 	$('input.text').focus(function(){
 		$(this).select();
 	});
 	
-	// this one actually has little impact, the .hasClass('disabled') in each edit(), remove() etc... fires faster
+	// this one actually has little impact, the .hasClass('disabled') in each edit_link_display(), remove() etc... fires faster
 	$('a.button').live('click', function() {
 		if( $(this).hasClass('disabled') ) {
 			return false;
@@ -19,7 +19,7 @@ $(document).ready(function(){
 });
 
 // Create new link and add to table
-function add() {
+function add_link() {
 	if( $('#add-button').hasClass('disabled') ) {
 		return false;
 	}
@@ -38,11 +38,11 @@ function add() {
 				$('#main_table tbody').prepend( data.html ).trigger("update");
 				$('#nourl_found').css('display', 'none');
 				zebra_table();
-				increment();
+				increment_counter();
 				toggle_share_fill_boxes( data.url.url, data.shorturl, data.url.title );
 			}
 
-			reset_url();
+			add_link_reset();
 			end_loading("#add-button");
 			end_disable("#add-button");
 
@@ -63,7 +63,7 @@ function toggle_share_fill_boxes( url, shorturl, title ) {
 }
 
 // Display the edition interface
-function edit(id) {
+function edit_link_display(id) {
 	if( $('#edit-button-'+id).hasClass('disabled') ) {
 		return false;
 	}
@@ -82,7 +82,7 @@ function edit(id) {
 }
 
 // Delete a link
-function remove(id) {
+function remove_link(id) {
 	if( $('#delete-button-'+id).hasClass('disabled') ) {
 		return false;
 	}
@@ -104,7 +104,7 @@ function remove(id) {
 
 					zebra_table();
 				});
-				decrement();
+				decrement_counter();
 			} else {
 				alert('something wrong happened while deleting :/');
 			}
@@ -113,19 +113,19 @@ function remove(id) {
 }
 
 // Redirect to stat page
-function stats(link) {
+function go_stats(link) {
 	window.location=link;
 }
 
 // Cancel edition of a link
-function hide_edit(id) {
+function edit_link_hide(id) {
 	$("#edit-" + id).fadeOut(200, function(){
 		end_disable('#actions-'+id+' .button');
 	});
 }
 
 // Save edition of a link
-function edit_save(id) {
+function edit_link_save(id) {
 	add_loading("#edit-close-" + id);
 	var newurl = encodeURI( $("#edit-url-" + id).val() );
 	var newkeyword = $("#edit-keyword-" + id).val();
@@ -169,20 +169,20 @@ function zebra_table() {
 }
 
 // Ready to add another URL
-function reset_url() {
+function add_link_reset() {
 	$('#add-url').val('http://').focus();
 	$('#add-keyword').val('');
 }
 
 // Increment URL counters
-function increment() {
+function increment_counter() {
 	$('.increment').each(function(){
 		$(this).html( parseInt($(this).html()) + 1);
 	});
 }
 
 // Decrement URL counters
-function decrement() {
+function decrement_counter() {
 	$('.increment').each(function(){
 		$(this).html( parseInt($(this).html()) - 1 );
 	});
-- 
2.45.0