Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
merge pullrequest jenkinsci#6 'Enable shortcut key'
  • Loading branch information
imod committed Aug 31, 2012
1 parent 03adcae commit 202584a
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 2,364 deletions.
14 changes: 7 additions & 7 deletions pom.xml
@@ -1,11 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.430</version>
<!-- <version>1.460</version> version caused JENKINS-13518 -->
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.451</version>
<!-- <version>1.460</version> version caused JENKINS-13518 -->
</parent>

<artifactId>scriptler</artifactId>
<name>Scriptler</name>
Expand Down
Expand Up @@ -26,11 +26,6 @@ THE SOFTWARE.

<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<script src="${it.pluginResourcePath}lib/codemirror.js"></script>
<link rel="stylesheet" href="${it.pluginResourcePath}lib/codemirror.css" ></link>
<script src="${it.pluginResourcePath}mode/clike/clike.js"></script>
<link rel="stylesheet" href="${it.pluginResourcePath}mode/clike/clike.css" ></link>
<style>.CodeMirror {border: 2px inset #dee;}</style>

<l:layout norefresh="true">
<st:include page="sidepanel.jelly" />
Expand Down Expand Up @@ -76,7 +71,7 @@ THE SOFTWARE.
</table>
</f:block>
<f:entry title="${%Script}">
<textarea id="script" name="script" style="width:100%; height:20em">
<textarea id="script" name="script" class="script">
<j:out value="${script.script}" />
</textarea>
</f:entry>
Expand All @@ -87,11 +82,6 @@ THE SOFTWARE.
</f:form>
</l:main-panel>
</l:layout>
<script>
var editor = CodeMirror.fromTextArea(document.getElementById("script"), {
lineNumbers: true,
matchBrackets: true,
mode: "text/x-groovy"
});
</script>
</j:jelly>
<st:adjunct includes="org.kohsuke.stapler.codemirror.mode.clike.clike"/>
<st:adjunct includes="org.kohsuke.stapler.codemirror.theme.default"/>
</j:jelly>
Expand Up @@ -24,11 +24,6 @@ THE SOFTWARE.

<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
xmlns:p="/lib/hudson/scriptler">
<script src="${it.pluginResourcePath}lib/codemirror.js"></script>
<link rel="stylesheet" href="${it.pluginResourcePath}lib/codemirror.css"></link>
<script src="${it.pluginResourcePath}mode/clike/clike.js"></script>
<link rel="stylesheet" href="${it.pluginResourcePath}mode/clike/clike.css"></link>
<style>.CodeMirror {border: 2px inset #dee;}</style>

<l:layout norefresh="true">
<st:include page="sidepanel.jelly" />
Expand Down Expand Up @@ -100,7 +95,7 @@ THE SOFTWARE.
</tr>
</table>

<textarea id="script" name="script" style="width:100%; height:20em">
<textarea id="script" name="script" class="script" script-readOnly="${readOnly}">
<j:out value="${script.script}" />
</textarea>
<div align="right">
Expand All @@ -116,13 +111,6 @@ THE SOFTWARE.
</j:if>
</l:main-panel>
</l:layout>
<script>
var editor = CodeMirror.fromTextArea(document.getElementById("script"), {
lineNumbers: true,
matchBrackets: true,
mode: "text/x-groovy",
readOnly:
${readOnly}
});
</script>
<st:adjunct includes="org.kohsuke.stapler.codemirror.mode.clike.clike"/>
<st:adjunct includes="org.kohsuke.stapler.codemirror.theme.default"/>
</j:jelly>
Expand Up @@ -22,12 +22,6 @@

<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<script src="${it.pluginResourcePath}lib/codemirror.js"></script>
<link rel="stylesheet" href="${it.pluginResourcePath}lib/codemirror.css" ></link>
<script src="${it.pluginResourcePath}mode/clike/clike.js"></script>
<link rel="stylesheet" href="${it.pluginResourcePath}mode/clike/clike.css" ></link>
<style>.CodeMirror {border: 2px inset #dee;}</style>

<l:layout norefresh="true">
<st:include page="sidepanel.jelly" />
<l:main-panel>
Expand Down Expand Up @@ -59,7 +53,7 @@
<f:checkbox name="onlyMaster" checked="${script.onlyMaster}" />
</f:entry>
<f:entry title="${%Script}">
<textarea id="script" name="script" style="width:100%; height:20em">
<textarea id="script" name="script" class="script">
</textarea>
</f:entry>
<f:block>
Expand Down Expand Up @@ -91,11 +85,6 @@

</l:main-panel>
</l:layout>
<script>
var editor = CodeMirror.fromTextArea(document.getElementById("script"), {
lineNumbers: true,
matchBrackets: true,
mode: "text/x-groovy"
});
</script>
</j:jelly>
<st:adjunct includes="org.kohsuke.stapler.codemirror.mode.clike.clike"/>
<st:adjunct includes="org.kohsuke.stapler.codemirror.theme.default"/>
</j:jelly>
53 changes: 0 additions & 53 deletions src/main/webapp/lib/codemirror.css

This file was deleted.

0 comments on commit 202584a

Please sign in to comment.