diff --git a/syweb/webclient/app-filter.js b/syweb/webclient/app-filter.js
index f19db4141d..65da0d312d 100644
--- a/syweb/webclient/app-filter.js
+++ b/syweb/webclient/app-filter.js
@@ -29,10 +29,10 @@ angular.module('matrixWebClient')
return s + "s";
}
if (t < 60 * 60) {
- return m + "m "; // + s + "s";
+ return m + "m"; // + s + "s";
}
if (t < 24 * 60 * 60) {
- return h + "h "; // + m + "m";
+ return h + "h"; // + m + "m";
}
return d + "d "; // + h + "h";
};
@@ -76,17 +76,6 @@ angular.module('matrixWebClient')
return filtered;
};
})
-.filter('stateEventsFilter', function($sce) {
- return function(events) {
- var filtered = {};
- angular.forEach(events, function(value, key) {
- if (value && typeof(value.state_key) === "string") {
- filtered[key] = value;
- }
- });
- return filtered;
- };
-})
.filter('unsafe', ['$sce', function($sce) {
return function(text) {
return $sce.trustAsHtml(text);
diff --git a/syweb/webclient/test/unit/filters.spec.js b/syweb/webclient/test/unit/filters.spec.js
new file mode 100644
index 0000000000..3dc735b2c8
--- /dev/null
+++ b/syweb/webclient/test/unit/filters.spec.js
@@ -0,0 +1,50 @@
+describe('durationFilter', function() {
+ var filter, durationFilter;
+
+ beforeEach(module('matrixWebClient'));
+ beforeEach(module('matrixFilter'));
+ beforeEach(inject(function($filter) {
+ filter = $filter;
+ durationFilter = filter("duration");
+ }));
+
+ it("should represent 15000 ms as '15s'", function() {
+ var output = durationFilter(15000);
+ expect(output).toEqual("15s");
+ });
+
+ it("should represent 60000 ms as '1m'", function() {
+ var output = durationFilter(60000);
+ expect(output).toEqual("1m");
+ });
+
+ it("should represent 65000 ms as '1m'", function() {
+ var output = durationFilter(65000);
+ expect(output).toEqual("1m");
+ });
+
+ it("should represent 10 ms as '0s'", function() {
+ var output = durationFilter(10);
+ expect(output).toEqual("0s");
+ });
+
+ it("should represent 4m as '4m'", function() {
+ var output = durationFilter(1000*60*4);
+ expect(output).toEqual("4m");
+ });
+
+ it("should represent 4m30s as '4m'", function() {
+ var output = durationFilter(1000*60*4 + 1000*30);
+ expect(output).toEqual("4m");
+ });
+
+ it("should represent 2h as '2h'", function() {
+ var output = durationFilter(1000*60*60*2);
+ expect(output).toEqual("2h");
+ });
+
+ it("should represent 2h35m as '2h'", function() {
+ var output = durationFilter(1000*60*60*2 + 1000*60*35);
+ expect(output).toEqual("2h");
+ });
+});
\ No newline at end of file
|
