You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/03 11:00:12 UTC
[44/52] [abbrv] [partial] incubator-kylin git commit: update
ace-builds to new version
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/99a418c0/webapp/app/components/ace-builds/kitchen-sink-req.html
----------------------------------------------------------------------
diff --git a/webapp/app/components/ace-builds/kitchen-sink-req.html b/webapp/app/components/ace-builds/kitchen-sink-req.html
deleted file mode 100644
index 9d42bd3..0000000
--- a/webapp/app/components/ace-builds/kitchen-sink-req.html
+++ /dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
-
-<html lang="en">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Ace Kitchen Sink</title>
- <meta name="author" content="Fabian Jakobs">
- <!--
-
- Ace
- version
- commit
-
- -->
-
-
-
-
- <link rel="stylesheet" href="kitchen-sink/styles.css" type="text/css" media="screen" charset="utf-8">
-
-</head>
-<body>
- <a href="http://ajaxorg.github.com/ace/" >
- <img id="logo" src="kitchen-sink/logo.png">
- </a>
- <table id="controls">
- <tr>
- <td>
- <label for="doc">Document</label>
- </td><td>
- <select id="doc" size="1">
- </select>
- </td>
- </tr>
- <tr>
- <td >
- <label for="mode">Mode</label>
- </td><td>
- <select id="mode" size="1">
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <label for="split">Split</label>
- </td><td>
- <select id="split" size="1">
- <option value="none">None</option>
- <option value="below">Below</option>
- <option value="beside">Beside</option>
- </select>
- </td>
- </tr>
- <tr>
- <td >
- <label for="theme">Theme</label>
- </td><td>
- <select id="theme" size="1">
- <optgroup label="Bright">
- <option value="ace/theme/chrome">Chrome</option>
- <option value="ace/theme/clouds">Clouds</option>
- <option value="ace/theme/crimson_editor">Crimson Editor</option>
- <option value="ace/theme/dawn">Dawn</option>
- <option value="ace/theme/dreamweaver">Dreamweaver</option>
- <option value="ace/theme/eclipse">Eclipse</option>
- <option value="ace/theme/github">GitHub</option>
- <option value="ace/theme/solarized_light">Solarized Light</option>
- <option value="ace/theme/textmate" selected="selected">TextMate</option>
- <option value="ace/theme/tomorrow">Tomorrow</option>
- <option value="ace/theme/xcode">XCode</option>
- </optgroup>
- <optgroup label="Dark">
- <option value="ace/theme/ambiance">Ambiance</option>
- <option value="ace/theme/chaos">Chaos</option>
- <option value="ace/theme/clouds_midnight">Clouds Midnight</option>
- <option value="ace/theme/cobalt">Cobalt</option>
- <option value="ace/theme/idle_fingers">idleFingers</option>
- <option value="ace/theme/kr_theme">krTheme</option>
- <option value="ace/theme/merbivore">Merbivore</option>
- <option value="ace/theme/merbivore_soft">Merbivore Soft</option>
- <option value="ace/theme/mono_industrial">Mono Industrial</option>
- <option value="ace/theme/monokai">Monokai</option>
- <option value="ace/theme/pastel_on_dark">Pastel on dark</option>
- <option value="ace/theme/solarized_dark">Solarized Dark</option>
- <option value="ace/theme/twilight">Twilight</option>
- <option value="ace/theme/tomorrow_night">Tomorrow Night</option>
- <option value="ace/theme/tomorrow_night_blue">Tomorrow Night Blue</option>
- <option value="ace/theme/tomorrow_night_bright">Tomorrow Night Bright</option>
- <option value="ace/theme/tomorrow_night_eighties">Tomorrow Night 80s</option>
- <option value="ace/theme/vibrant_ink">Vibrant Ink</option>
- </optgroup>
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <label for="fontsize">Font Size</label>
- </td><td>
- <select id="fontsize" size="1">
- <option value="10px">10px</option>
- <option value="11px">11px</option>
- <option value="12px" selected="selected">12px</option>
- <option value="14px">14px</option>
- <option value="16px">16px</option>
- <option value="20px">20px</option>
- <option value="24px">24px</option>
- </select>
- </td>
- </tr>
- <tr>
- <td>
- <label for="folding">Code Folding</label>
- </td><td>
- <select id="folding" size="1">
- <option value="manual">manual</option>
- <option value="markbegin" selected="selected">mark begin</option>
- <option value="markbeginend">mark begin and end</option>
- </select>
- </td>
- </tr>
- <tr>
- <td >
- <label for="keybinding">Key Binding</label>
- </td><td>
- <select id="keybinding" size="1">
- <option value="ace">Ace</option>
- <option value="vim">Vim</option>
- <option value="emacs">Emacs</option>
- <option value="custom">Custom</option>
- </select>
- </td>
- </tr>
- <tr>
- <td >
- <label for="soft_wrap">Soft Wrap</label>
- </td><td>
- <select id="soft_wrap" size="1">
- <option value="off">Off</option>
- <option value="40">40 Chars</option>
- <option value="80">80 Chars</option>
- <option value="free">Free</option>
- </select>
- </td>
- </tr>
-
- <tr><td colspan="2">
- <table id="more-controls">
- <tr>
- <td>
- <label for="select_style">Full Line Selection</label>
- </td><td>
- <input type="checkbox" name="select_style" id="select_style" checked>
- </td>
- </tr>
- <tr>
- <td>
- <label for="highlight_active">Highlight Active Line</label>
- </td><td>
- <input type="checkbox" name="highlight_active" id="highlight_active" checked>
- </td>
- </tr>
- <tr>
- <td >
- <label for="show_hidden">Show Invisibles</label>
- </td><td>
- <input type="checkbox" name="show_hidden" id="show_hidden" checked>
- </td>
- </tr>
- <tr>
- <td >
- <label for="display_indent_guides">Show Indent Guides</label>
- </td><td>
- <input type="checkbox" name="display_indent_guides" id="display_indent_guides" checked>
- </td>
- </tr>
- <tr>
- <td >
- <label for="show_hscroll">Persistent HScroll</label>
- </td><td>
- <input type="checkbox" name="show_hscroll" id="show_hscroll">
- </td>
- </tr>
- <tr>
- <td >
- <label for="animate_scroll">Animate scrolling</label>
- </td><td>
- <input type="checkbox" name="animate_scroll" id="animate_scroll">
- </td>
- </tr>
- <tr>
- <td >
- <label for="show_gutter">Show Gutter</label>
- </td><td>
- <input type="checkbox" id="show_gutter" checked>
- </td>
- </tr>
- <tr>
- <td >
- <label for="show_print_margin">Show Print Margin</label>
- </td><td>
- <input type="checkbox" id="show_print_margin" checked>
- </td>
- </tr>
- <tr>
- <td >
- <label for="soft_tab">Use Soft Tab</label>
- </td><td>
- <input type="checkbox" id="soft_tab" checked>
- </td>
- </tr>
- <tr>
- <td >
- <label for="highlight_selected_word">Highlight selected word</label>
- </td>
- <td>
- <input type="checkbox" id="highlight_selected_word" checked>
- </td>
- </tr>
- <tr>
- <td >
- <label for="enable_behaviours">Enable Behaviours</label>
- </td>
- <td>
- <input type="checkbox" id="enable_behaviours">
- </td>
- </tr>
- <tr>
- <td >
- <label for="fade_fold_widgets">Fade Fold Widgets</label>
- </td>
- <td>
- <input type="checkbox" id="fade_fold_widgets">
- </td>
- </tr>
- <tr>
- <td >
- <label for="highlight_token">Show token info</label>
- </td>
- <td>
- <input type="checkbox" id="highlight_token">
- </td>
- </tr>
- </table>
- </td></tr>
- </table>
-
- </div>
- </div>
-</div>
- <div id="editor-container"></div>
-
-
-
-
- <script src="../demo/kitchen-sink/require.js"></script>
- <script src="src/ace.js" data-ace-base="src"></script>
- <script src="src/keybinding-vim.js"></script>
- <script src="src/keybinding-emacs.js"></script>
- <script src="kitchen-sink/demo.js"></script>
- <script type="text/javascript" charset="utf-8">
- require(["kitchen-sink/demo", "ace/ace"])
-
- </script>
-
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/99a418c0/webapp/app/components/ace-builds/kitchen-sink.html
----------------------------------------------------------------------
diff --git a/webapp/app/components/ace-builds/kitchen-sink.html b/webapp/app/components/ace-builds/kitchen-sink.html
index 66c6951..cfcfff5 100644
--- a/webapp/app/components/ace-builds/kitchen-sink.html
+++ b/webapp/app/components/ace-builds/kitchen-sink.html
@@ -7,22 +7,19 @@
<meta name="author" content="Fabian Jakobs">
<!--
Ace
- version
+ version 1.1.8
commit
-->
-
+ <link rel="stylesheet" href="demo/kitchen-sink/styles.css" type="text/css" media="screen" charset="utf-8">
+ <script async="true" src="https://use.edgefonts.net/source-code-pro.js"></script>
<link href="./doc/site/images/favicon.ico" rel="icon" type="image/x-icon">
-
- <link rel="stylesheet" href="kitchen-sink/styles.css" type="text/css" media="screen" charset="utf-8">
- <script async="true" src="http://use.edgefonts.net/source-code-pro.js"></script>
-
</head>
<body>
<div id="optionsPanel" style="position:absolute;height:100%;width:260px">
<a href="http://c9.io" title="Cloud9 IDE | Your code anywhere, anytime">
- <img id="c9-logo" src="kitchen-sink/logo.png" style="width: 172px;margin: -9px 30px -12px 51px;">
+ <img id="c9-logo" src="demo/kitchen-sink/logo.png" style="width: 172px;margin: -9px 30px -12px 51px;">
</a>
<div style="position: absolute; overflow: hidden; top:100px; bottom:0">
<div style="width: 120%; height:100%; overflow-y: scroll">
@@ -272,7 +269,7 @@
<script src="src/ace.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
<script src="src/keybinding-vim.js"></script>
<script src="src/keybinding-emacs.js"></script>
- <script src="kitchen-sink/demo.js"></script>
+ <script src="demo/kitchen-sink/demo.js"></script>
<script type="text/javascript" charset="utf-8">
require("kitchen-sink/demo");
</script>