Skip to content

Commit bdf3a8e

Browse files
corneadougcorneadoug
committed
Include lodash + Interpreter Web refactoring Part1: reducing code
1 parent 931067a commit bdf3a8e

File tree

5 files changed

+139
-242
lines changed

5 files changed

+139
-242
lines changed

‎zeppelin-web/bower.json‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
"ng-sortable": "~1.1.9",
2323
"angular-elastic": "~2.4.2",
2424
"angular-elastic-input": "~2.0.1",
25-
"angular-xeditable" : "0.1.8",
26-
"highlightjs": "~8.4.0"
25+
"angular-xeditable": "0.1.8",
26+
"highlightjs": "~8.4.0",
27+
"lodash": "~3.9.3"
2728
},
2829
"devDependencies": {
2930
"angular-mocks": "1.3.8",
@@ -35,19 +36,23 @@
3536
},
3637
"overrides": {
3738
"ace-builds": {
38-
"main": ["src-noconflict/ace.js",
39-
"src-noconflict/mode-scala.js",
40-
"src-noconflict/mode-sql.js",
41-
"src-noconflict/mode-markdown.js",
42-
"src-noconflict/keybinding-emacs.js",
43-
"src-noconflict/ext-language_tools.js",
44-
"src-noconflict/theme-github.js"],
39+
"main": [
40+
"src-noconflict/ace.js",
41+
"src-noconflict/mode-scala.js",
42+
"src-noconflict/mode-sql.js",
43+
"src-noconflict/mode-markdown.js",
44+
"src-noconflict/keybinding-emacs.js",
45+
"src-noconflict/ext-language_tools.js",
46+
"src-noconflict/theme-github.js"
47+
],
4548
"version": "1.1.8",
4649
"name": "ace-builds"
4750
},
4851
"highlightjs": {
49-
"main": ["highlight.pack.js",
50-
"styles/github.css"],
52+
"main": [
53+
"highlight.pack.js",
54+
"styles/github.css"
55+
],
5156
"version": "8.4.0",
5257
"name": "highlightjs"
5358
}

‎zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<div>
2+
<div class="row">
3+
<div class="col-md-12">
4+
<div class="interpreterSettingAdd" ng-show="showAddNewSetting">
5+
<hr />
6+
<h4>Create new interpreter</h4>
7+
8+
<div class="form-group" style="width:200px">
9+
<b>Name</b>
10+
<input id="newInterpreterSettingName" input pu-elastic-input
11+
pu-elastic-input-minwidth="180px" ng-model="newInterpreterSetting.name" />
12+
</div>
13+
14+
<b>Interpreter</b>
15+
<div class="form-group"
16+
style="width:180px">
17+
<select class="form-control input-sm" ng-model="newInterpreterSetting.group"
18+
ng-change="newInterpreterGroupChange()">
19+
<option ng-repeat="(groupName, interpreterGroup) in availableInterpreters" value="{{groupName}}">{{groupName}}</option>
20+
</select>
21+
</div>
22+
23+
<b>Properties</b>
24+
<table class="table table-striped properties">
25+
<tr>
26+
<th>name</th>
27+
<th>value</th>
28+
<th>description</th>
29+
<th>action</th>
30+
</tr>
31+
<tr ng-repeat="(key, value) in newInterpreterSetting.properties">
32+
<td>{{key}}</td>
33+
<td><textarea msd-elastic ng-model="value.value"></textarea></td>
34+
<td>{{value.description}}</td>
35+
<td>
36+
<div class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">
37+
</div>
38+
</td>
39+
</tr>
40+
41+
<tr>
42+
<td>
43+
<input pu-elastic-input pu-elastic-input-minwidth="180px"
44+
ng-model="newInterpreterSetting.propertyKey" />
45+
</td>
46+
<td><textarea msd-elastic ng-model="newInterpreterSetting.propertyValue"></textarea></td>
47+
<td></td>
48+
<td>
49+
<div class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterProperty()">
50+
</div>
51+
</td>
52+
</tr>
53+
</table>
54+
55+
<span class="btn btn-primary" ng-click="addNewInterpreterSetting()">
56+
Save
57+
</span>
58+
<span class="btn btn-default" ng-click="showAddNewSetting=false">
59+
Cancel
60+
</span>
61+
</div>
62+
</div>
63+
</div>
64+
</div>

0 commit comments

Comments
 (0)