Skip to content

Commit 6174a53

Browse files
committed
Update to hr.js version 0.2.5
1 parent 8e0b240 commit 6174a53

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

client/utils/dialogs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ define([
2222
d.reject(result);
2323
}
2424
});
25-
diag.render();
25+
diag.update();
2626

2727
return d.promise;
2828
},

client/views/components/date.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ define([
2222

2323
render: function() {
2424
if (this.interval != null) clearInterval(this.interval);
25-
this.interval = setInterval(_.bind(this.render, this), this.options.update);
25+
this.interval = setInterval(_.bind(this.update, this), this.options.update);
2626
this.options.update = this.options.update*this.options.updateD;
2727
this.$el.html(moment(this.options.time*1000).fromNow());
2828
return this.ready();

client/views/components/lateralbar/files.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ define([
2121
if (this.model == null) this.model = new File({
2222
"codebox": box
2323
});
24-
this.model.on("set", this.render, this);
24+
this.model.on("set", this.update, this);
2525
if (this.options.path != null) this.load(this.options.path);
2626
return this;
2727
},
@@ -38,7 +38,7 @@ define([
3838
// Render the file view
3939
render: function() {
4040
if (this.model.path() == null) {
41-
return this;
41+
return;
4242
}
4343
return FilesBaseView.__super__.render.apply(this, arguments);
4444
},
@@ -96,7 +96,7 @@ define([
9696
"model": this.model
9797
});
9898
this.subfiles.$el.appendTo(this.$(".files"));
99-
this.subfiles.render();
99+
this.subfiles.update();
100100
}
101101
this.$el.toggleClass("open");
102102
} else {
@@ -132,7 +132,7 @@ define([
132132
var that = this;
133133
this.$el.empty();
134134

135-
this.model.listdir().done(function(files) {
135+
this.model.listdir().then(function(files) {
136136
that.empty();
137137
that.countFiles = 0;
138138

@@ -143,14 +143,14 @@ define([
143143
"codebox": that.codebox,
144144
"model": file
145145
});
146-
v.render();
146+
v.update();
147147
v.$el.appendTo(that.$el);
148148
that.countFiles = that.countFiles + 1;
149149
});
150150
that.trigger("count", that.countFiles);
151151
});
152-
153-
return this.ready();
152+
153+
return that.ready();
154154
},
155155
});
156156

client/views/components/tabs.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ define([
138138
setSection: function(section) {
139139
this.section = section;
140140
this.open();
141-
this.tabs.render();
141+
this.tabs.update();
142142
},
143143

144144
// Create section
@@ -224,7 +224,7 @@ define([
224224
// Set tab title
225225
setTabTitle: function(t) {
226226
this.tabs.tabs[this.tabid].title = t;
227-
this.tabs.tabs[this.tabid].tab.render();
227+
this.tabs.tabs[this.tabid].tab.update();
228228
return this;
229229
},
230230

@@ -234,7 +234,7 @@ define([
234234
return this;
235235
}
236236
this.tabs.tabs[this.tabid].state = (value == null || value) ? state : null;
237-
this.tabs.tabs[this.tabid].tab.render();
237+
this.tabs.tabs[this.tabid].tab.update();
238238
return this;
239239
},
240240

@@ -419,13 +419,13 @@ define([
419419

420420
this.tabs[tabid].view.trigger("tab:ready");
421421

422-
this.tabs[tabid].tab.render();
423-
this.tabs[tabid].view.render();
422+
this.tabs[tabid].tab.update();
423+
this.tabs[tabid].view.update();
424424

425425
this.addComponent("tabs_tabs", this.tabs[tabid].tab);
426426
this.addComponent("tabs_content", this.tabs[tabid].view);
427427

428-
if (options.render) this.render();
428+
if (options.render) this.update();
429429
}
430430
if (this.activeTab == null || options.open) this.open(tabid);
431431
return this.tabs[tabid].view;
@@ -526,7 +526,7 @@ define([
526526
this.trigger("tab:"+tabid+":close");
527527
this.trigger("tabs:close", tabid);
528528
if (_.size(this.tabs) == 0) this.trigger("tabs:default");
529-
this.render();
529+
this.update();
530530
return this;
531531
},
532532

@@ -548,7 +548,7 @@ define([
548548
// Define tabs layout
549549
setLayout: function(l) {
550550
this.layout = l;
551-
this.render();
551+
this.update();
552552
}
553553
}, {
554554
Panel: TabPanelView

client/views/files/base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ define([
4444
// Render the file view
4545
render: function() {
4646
if (this.model.path() == null) {
47-
return this;
47+
return;
4848
}
4949
return FilesBaseView.__super__.render.apply(this, arguments);
5050
},

client/views/tabs/file.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ define([
1818
}
1919

2020
// Bind file events
21-
this.model.on("set", this.render, this);
21+
this.model.on("set", this.update, this);
2222
this.model.on("destroy", function() {
2323
this.closeTab();
2424
}, this);
@@ -37,7 +37,7 @@ define([
3737
var f = new this.fileHandler.View({
3838
model: this.model
3939
}, this);
40-
f.render();
40+
f.update();
4141
f.$el.appendTo(this.$el);
4242
this.adaptFile();
4343
return this.ready();

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"event-stream": "3.0.11",
1111
"readable-stream": "1.0.2",
1212
"request": "2.27.0",
13-
"hr.js": "0.2.3",
13+
"hr.js": "0.2.5",
1414
"commander": "1.1.1",
1515
"googlediff": "0.1.0",
1616
"cryptojs": "2.5.3",

0 commit comments

Comments
 (0)