Merge branch 'clipboardjs' into master

This replaces clippy.sfw with Javascript for issue #1241

6 files changed, 43 insertions, 47 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 4d30e049..b30aee97 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -171,6 +171,11 @@ public abstract class RepositoryPage extends RootPage {
 		add(searchForm);

 		searchForm.setTranslatedAttributes();

 

+		// load clipboard library to copy repository URL

+		addBottomScript("../../clipboard/clipboard.min.js");

+		// instantiate clipboard

+		addBottomScript("../../clipboard/gitblit-ctcbtn.js");

+

 		// set stateless page preference

 		setStatelessHint(true);

 	}

diff --git a/src/main/java/com/gitblit/wicket/pages/SummaryPage.html b/src/main/java/com/gitblit/wicket/pages/SummaryPage.html
index 2d1b6a56..8915ecf5 100644
--- a/src/main/java/com/gitblit/wicket/pages/SummaryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.html
@@ -61,7 +61,7 @@
 	<wicket:fragment wicket:id="ownersFragment">

 		

 	</wicket:fragment>

-	

-</wicket:extend>	

+

+</wicket:extend>

 </body>

 </html>
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
index 46c0f7ee..fd64b776 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
@@ -586,20 +586,14 @@ pt push</pre>
   		<img wicket:id="copyIcon" wicket:message="title:gb.copyToClipboard"></img>

   	</span>

 </wicket:fragment>

-    

 

-<!-- flash-based button-press copy & paste -->

-<wicket:fragment wicket:id="clippyPanel">

-	<object wicket:message="title:gb.copyToClipboard" style="vertical-align:middle;"

-   			wicket:id="clippy"

-   			width="14" 

-   			height="14"

-   			bgcolor="#ffffff" 

-       		quality="high"

-       		wmode="transparent"

-       		scale="noscale"

-       		allowScriptAccess="sameDomain"></object>

-</wicket:fragment>

+

+	<!-- JavaScript automatic copy to clipboard -->

+	<wicket:fragment wicket:id="clippyPanel">

+		<span class="tooltipped tooltipped-n">

+			<img class="ctcbtn" wicket:id="copyIcon" wicket:message="title:gb.copyToClipboard" />

+		</span>

+	</wicket:fragment>

 	

 </wicket:extend>    

 </body>

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index 1750b859..d6d188df 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -102,7 +102,6 @@ import com.gitblit.wicket.panels.CommentPanel;
 import com.gitblit.wicket.panels.DiffStatPanel;

 import com.gitblit.wicket.panels.IconAjaxLink;

 import com.gitblit.wicket.panels.LinkPanel;

-import com.gitblit.wicket.panels.ShockWaveComponent;

 import com.gitblit.wicket.panels.SimpleAjaxLink;

 

 /**

@@ -1644,12 +1643,12 @@ public class TicketPage extends RepositoryPage {
 

 	protected Fragment createCopyFragment(String wicketId, String text) {

 		if (app().settings().getBoolean(Keys.web.allowFlashCopyToClipboard, true)) {

-			// clippy: flash-based copy & paste

+			// javascript: browser JS API based copy to clipboard

 			Fragment copyFragment = new Fragment(wicketId, "clippyPanel", this);

-			String baseUrl = WicketUtils.getGitblitURL(getRequest());

-			ShockWaveComponent clippy = new ShockWaveComponent("clippy", baseUrl + "/clippy.swf");

-			clippy.setValue("flashVars", "text=" + StringUtils.encodeURL(text));

-			copyFragment.add(clippy);

+			ContextImage img = WicketUtils.newImage("copyIcon", "clippy.png");

+			// Add the ID of the target element that holds the text to copy to clipboard

+			img.add(new SimpleAttributeModifier("data-clipboard-text", text));

+			copyFragment.add(img);

 			return copyFragment;

 		} else {

 			// javascript: manual copy & paste with modal browser prompt dialog

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
index a537277f..e4b7427a 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
@@ -12,12 +12,14 @@
 	

 	<wicket:fragment wicket:id="repositoryUrlFragment">

 		<div class="btn-toolbar" style="margin: 0px;">

-			<div class="btn-group repositoryUrlContainer">

+			<div class="btn-group repositoryUrlContainer tooltipped tooltipped-w">

 				<img style="vertical-align: middle;padding: 0px 0px 1px 3px;" wicket:id="accessRestrictionIcon"></img>

 				<span wicket:id="menu"></span>

    				<div class="repositoryUrl">

    					<span wicket:id="primaryUrl">[repository primary url]</span>

-   					<span class="hidden-phone hidden-tablet" wicket:id="copyFunction"></span>

+					<span class="tooltipped tooltipped-n">

+ 	  					<span class="hidden-phone hidden-tablet" wicket:id="copyFunction"></span>

+					</span>

    				</div>

    				<span class="hidden-phone hidden-tablet repositoryUrlRightCap" wicket:id="primaryUrlPermission">[repository primary url permission]</span>

    			</div>

@@ -33,7 +35,7 @@
 	

 	<wicket:fragment wicket:id="applicationMenusFragment">

 		<div class="btn-toolbar" style="margin: 4px 0px 0px 0px;">

-			<div class="btn-group" wicket:id="appMenus">

+			<div class="btn-group tooltipped tooltipped-w" wicket:id="appMenus">

 				<span wicket:id="appMenu"></span>

    			</div>

 		</div>

@@ -85,17 +87,9 @@
     	</span>

     </wicket:fragment>

     

-    <!-- flash-based button-press copy & paste -->

+    <!-- JavaScript automatic copy to clipboard -->

     <wicket:fragment wicket:id="clippyPanel">

-   		<object wicket:message="title:gb.copyToClipboard" style="vertical-align:middle;"

-   			wicket:id="clippy"

-   			width="14" 

-   			height="14"

-   			bgcolor="#ffffff" 

-       		quality="high"

-       		wmode="transparent"

-       		scale="noscale"

-       		allowScriptAccess="sameDomain"></object>

+		<img class="ctcbtn" wicket:id="copyIcon" wicket:message="title:gb.copyToClipboard" />

 	</wicket:fragment>

 

 	<wicket:fragment wicket:id="workingCopyFragment">

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
index 207f1250..2411e750 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.apache.wicket.Component;

 import org.apache.wicket.RequestCycle;

+import org.apache.wicket.behavior.SimpleAttributeModifier;

 import org.apache.wicket.markup.html.basic.Label;

 import org.apache.wicket.markup.html.image.ContextImage;

 import org.apache.wicket.markup.html.panel.Fragment;

@@ -140,8 +141,7 @@ public class RepositoryUrlPanel extends BasePanel {
 					RepositoryUrl repoUrl = item.getModelObject();

 					// repository url

 					Fragment fragment = new Fragment("repoUrl", "actionFragment", this);

-					Component content = new Label("content", repoUrl.url).setRenderBodyOnly(true);

-					WicketUtils.setCssClass(content, "commandMenuItem");

+					Component content = new Label("content", repoUrl.url).setOutputMarkupId(true);

 					fragment.add(content);

 					item.add(fragment);

 

@@ -150,7 +150,7 @@ public class RepositoryUrlPanel extends BasePanel {
 					String tooltip = getProtocolPermissionDescription(repository, repoUrl);

 					WicketUtils.setHtmlTooltip(permissionLabel, tooltip);

 					fragment.add(permissionLabel);

-					fragment.add(createCopyFragment(repoUrl.url));

+					fragment.add(createCopyFragment(repoUrl.url, content.getMarkupId()));

 				}

 			};

 

@@ -199,13 +199,15 @@ public class RepositoryUrlPanel extends BasePanel {
 			}

 		}

 

-		urlPanel.add(new Label("primaryUrl", primaryUrl.url).setRenderBodyOnly(true));

+		Label primaryUrlLabel = new Label("primaryUrl", primaryUrl.url);

+		primaryUrlLabel.setOutputMarkupId(true);

+		urlPanel.add(primaryUrlLabel);

 

 		Label permissionLabel = new Label("primaryUrlPermission", primaryUrl.hasPermission() ? primaryUrl.permission.toString() : externalPermission);

 		String tooltip = getProtocolPermissionDescription(repository, primaryUrl);

 		WicketUtils.setHtmlTooltip(permissionLabel, tooltip);

 		urlPanel.add(permissionLabel);

-		urlPanel.add(createCopyFragment(primaryUrl.url));

+		urlPanel.add(createCopyFragment(primaryUrl.url, primaryUrlLabel.getMarkupId()));

 

 		return urlPanel;

 	}

@@ -317,12 +319,13 @@ public class RepositoryUrlPanel extends BasePanel {
 							// command-line

 							String command = substitute(clientApp.command, repoUrl.url, baseURL, user.username, repository.name);

 							Label content = new Label("content", command);

+							content.setOutputMarkupId(true);

 							WicketUtils.setCssClass(content, "commandMenuItem");

 							fragment.add(content);

 							repoLinkItem.add(fragment);

 

 							// copy function for command

-							fragment.add(createCopyFragment(command));

+							fragment.add(createCopyFragment(command, content.getMarkupId()));

 						}

 					}};

 					appMenu.add(actionItems);

@@ -346,16 +349,17 @@ public class RepositoryUrlPanel extends BasePanel {
 		return permissionLabel;

 	}

 

-	protected Fragment createCopyFragment(String text) {

+	protected Fragment createCopyFragment(String text, String target) {

 		if (app().settings().getBoolean(Keys.web.allowFlashCopyToClipboard, true)) {

-			// clippy: flash-based copy & paste

+			// javascript: browser JS API based copy to clipboard

 			Fragment copyFragment = new Fragment("copyFunction", "clippyPanel", this);

-			String baseUrl = WicketUtils.getGitblitURL(getRequest());

-			ShockWaveComponent clippy = new ShockWaveComponent("clippy", baseUrl + "/clippy.swf");

-			clippy.setValue("flashVars", "text=" + StringUtils.encodeURL(text));

-			copyFragment.add(clippy);

+			ContextImage img = WicketUtils.newImage("copyIcon", "clippy.png");

+			// Add the ID of the target element that holds the text to copy to clipboard

+			img.add(new SimpleAttributeModifier("data-clipboard-target", "#"+target));

+			copyFragment.add(img);

 			return copyFragment;

-		} else {

+		}

+		else {

 			// javascript: manual copy & paste with modal browser prompt dialog

 			Fragment copyFragment = new Fragment("copyFunction", "jsPanel", this);

 			ContextImage img = WicketUtils.newImage("copyIcon", "clippy.png");