Skip to content
This repository has been archived by the owner on Mar 31, 2024. It is now read-only.

Commit

Permalink
Merge branch 'removeBootstrap2' into setDocTitle
Browse files Browse the repository at this point in the history
  • Loading branch information
spalger committed Oct 22, 2015
2 parents d6c54e9 + 85a0c8d commit e5af8fa
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 12,280 deletions.
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,5 @@
"url": "http://github.com/elastic/sense.git"
},
"devDependencies": {},
"dependencies": {
"@spalger/angular-bootstrap": "^0.12.1"
}
"dependencies": {}
}
30 changes: 14 additions & 16 deletions public/src/directives/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,18 @@ <h4>Autocomplete</h4>
</div>

</div>
</form>

<div class="settings-footer">
<button
ng-click="close()"
class="btn btn-default"
>
Cancel
</button>
<button
type="submit"
ng-disabled="settingsForm.$invalid"
class="btn btn-primary"
>
Save
</button>
</div>
<div class="settings-footer">
<button
ng-click="close()"
class="btn btn-default">
Cancel
</button>
<button
type="submit"
ng-disabled="settingsForm.$invalid"
class="btn btn-primary">
Save
</button>
</div>
</form>
6 changes: 3 additions & 3 deletions public/src/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let es = require('./es');
const storage = require('./storage');

function getFontSize() {
return storage.get('font_size') || 12;
return storage.get('font_size', 12);
}

function setFontSize(size) {
Expand All @@ -30,7 +30,7 @@ function setFontSize(size) {
}

function getWrapMode() {
return storage.get('wrap_mode') || true;
return storage.get('wrap_mode', true);
}

function setWrapMode(mode) {
Expand All @@ -46,7 +46,7 @@ function setBasicAuth(mode) {
}

function getAutocomplete() {
return storage.get('autocomplete_settings') || { fields: true, indices: true };
return storage.get('autocomplete_settings', { fields: true, indices: true });
}

function setAutocomplete(settings) {
Expand Down
8 changes: 6 additions & 2 deletions public/src/storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@ class Storage {
return val;
}

get(key) {
return this.decode(this.engine.getItem(this.encodeKey(key)));
get(key, _default) {
if (this.engine.hasItem(this.encodeKey(key))) {
return this.decode(this.engine.getItem(this.encodeKey(key)));
} else {
return _default;
}
}

delete(key) {
Expand Down
4 changes: 0 additions & 4 deletions public/webpackShims/font-awesome/css/font-awesome.min.css

This file was deleted.

Binary file not shown.
Binary file not shown.
414 changes: 0 additions & 414 deletions public/webpackShims/font-awesome/fonts/fontawesome-webfont.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions public/webpackShims/jquery/index.js

This file was deleted.

Loading

0 comments on commit e5af8fa

Please sign in to comment.