1
=== modified file 'Simple/CalcKeyboard.qml'
2
--- Simple/CalcKeyboard.qml	2013-06-11 19:33:52 +0000
3
+++ Simple/CalcKeyboard.qml	2013-09-11 10:39:56 +0000
4
@@ -30,7 +30,6 @@
5
30
        visible: formulaView.__wasAtYBegining && formulaView.__displaceDist > units.gu(2)
30
        visible: formulaView.__wasAtYBegining && formulaView.__displaceDist > units.gu(2)
6
31
        font.pixelSize: units.gu(2)
31
        font.pixelSize: units.gu(2)
7
32
        text: formulaView.__toBeRefresh ? i18n.tr("Release to start new calculation") : i18n.tr("Pull to start new calculation")
32
        text: formulaView.__toBeRefresh ? i18n.tr("Release to start new calculation") : i18n.tr("Pull to start new calculation")
8
33
        font.family: "Ubuntu"
9
34
        anchors.horizontalCenter: parent.horizontalCenter
33
        anchors.horizontalCenter: parent.horizontalCenter
10
35
        color: '#757373'
34
        color: '#757373'
11
36
    }
35
    }
12
37
36
13
=== modified file 'Simple/CalcLabel.qml'
14
--- Simple/CalcLabel.qml	2013-09-04 15:20:51 +0000
15
+++ Simple/CalcLabel.qml	2013-09-11 10:39:56 +0000
16
@@ -43,31 +43,10 @@
17
43
        id: row
43
        id: row
18
44
        height: numbersHeight
44
        height: numbersHeight
19
45
        width: parent.width
45
        width: parent.width
45
46
        Item {
46
        anchors.left: parent.left
46
47
            id: editIcon
47
47
48
            height: parent.height
48
        Item {
48
49
            width: units.gu(3)
49
            width: row.width - operatorLabel.width - formulaLabel.width
24
50
25
51
            Image {
26
52
                anchors.verticalCenter: parent.verticalCenter
27
53
                source: Qt.resolvedUrl("images/edit.png")
28
54
                visible: root.numbers || root.operation
29
55
            }
30
56
31
57
            MouseArea {
32
58
                anchors.fill: parent
33
59
                onClicked: {
34
60
                    if (root.numbers || root.operation) {
35
61
                        numberName.focus = true;
36
62
                        numberName.forceActiveFocus();
37
63
                        calcKeyboardVisible = false;
38
64
                    }
39
65
                }
40
66
            }
41
67
        }
42
68
43
69
        Item {
44
70
            width: row.width-editIcon.width-operatorLabel.width-formulaLabel.width
49
71
            height: parent.height
50
            height: parent.height
50
72
51
51
73
            TextField {
52
            TextField {
52
@@ -79,11 +58,11 @@
53
79
                    background: Item {}
58
                    background: Item {}
54
80
                }
59
                }
55
81
60
56
82
                visible: root.numbers || root.operation
57
83
58
84
                onActiveFocusChanged: {
61
                onActiveFocusChanged: {
60
85
                    if (numberName.activeFocus)
62
                    if (numberName.activeFocus) {
61
63
                        labelVisible = true
62
86
                        calcKeyboardVisible = false
64
                        calcKeyboardVisible = false
63
65
                    }
64
87
                }
66
                }
65
88
67
66
89
                readOnly: labelReadOnly
68
                readOnly: labelReadOnly
67
@@ -91,12 +70,14 @@
68
91
                color: "#FEFEFE"
70
                color: "#FEFEFE"
69
92
                onTextChanged: { labelText = numberName.text }
71
                onTextChanged: { labelText = numberName.text }
70
93
                hasClearButton: false
72
                hasClearButton: false
71
73
                maximumLength: 12
72
94
74
73
95
                InverseMouseArea {
75
                InverseMouseArea {
74
96
                    onClicked: {
76
                    onClicked: {
75
97
                        root.forceActiveFocus();
77
                        root.forceActiveFocus();
76
98
                        numberName.focus = false;
78
                        numberName.focus = false;
77
99
                        mouse.accepted = false;
79
                        mouse.accepted = false;
78
80
                        labelVisible = false;
79
100
                        calcKeyboardVisible = true;
81
                        calcKeyboardVisible = true;
80
101
                    }
82
                    }
81
102
                    anchors.fill: parent;
83
                    anchors.fill: parent;
82
@@ -106,23 +87,22 @@
83
106
            }
87
            }
84
107
88
85
108
            Image {
89
            Image {
87
109
                visible: numberName.focus && (root.numbers || root.operation)
90
                visible: labelVisible
88
110
                anchors.bottom: parent.bottom
91
                anchors.bottom: parent.bottom
89
111
                source: Qt.resolvedUrl("images/dot.png")
92
                source: Qt.resolvedUrl("images/dot.png")
90
112
                fillMode: Image.Tile
93
                fillMode: Image.Tile
93
113
                width: parent.width-units.gu(1)
94
                width: parent.width - units.gu(0.5)
94
114
                height: units.gu(1)/2
95
                height: units.gu(0.5)
95
115
            }
96
            }
96
116
        }
97
        }
97
117
98
98
118
        Label {
99
        Label {
99
119
            id: operatorLabel
100
            id: operatorLabel
101
120
            width: units.dp(2)
101
            width: units.gu(2)
102
121
            anchors.verticalCenter: parent.verticalCenter
102
            anchors.verticalCenter: parent.verticalCenter
103
122
            font.pixelSize: FontUtils.sizeToPixels("medium")
103
            font.pixelSize: FontUtils.sizeToPixels("medium")
104
123
            color: "#FEFEFE"
104
            color: "#FEFEFE"
105
124
            text: root.operation
105
            text: root.operation
106
125
            font.family: "Ubuntu"
107
126
        }
106
        }
108
127
        Label {
107
        Label {
109
128
            id: formulaLabel
108
            id: formulaLabel
110
@@ -132,7 +112,7 @@
111
132
            property bool isLast: root.isLast
112
            property bool isLast: root.isLast
112
133
113
113
134
            objectName: "formulaLabel"
114
            objectName: "formulaLabel"
115
135
            width: parent.width / 2
115
            width: parent.width / 1.5
116
136
            color: numbersColor
116
            color: numbersColor
117
137
            anchors.bottom: parent.bottom
117
            anchors.bottom: parent.bottom
118
138
            font.pixelSize: numbersHeight
118
            font.pixelSize: numbersHeight
119
@@ -140,7 +120,6 @@
120
140
            horizontalAlignment: Text.AlignRight
120
            horizontalAlignment: Text.AlignRight
121
141
            // If is a new calculation or if last calculation as been deleted print 0, else the number
121
            // If is a new calculation or if last calculation as been deleted print 0, else the number
122
142
            text: ((isLast && !newCalculation) || (root.numbers === "" && formulaView.headerItem.state !== "newPush")) ? "0" : root.numbers
122
            text: ((isLast && !newCalculation) || (root.numbers === "" && formulaView.headerItem.state !== "newPush")) ? "0" : root.numbers
123
143
            font.family: "Ubuntu"
124
144
        }
123
        }
125
145
    }
124
    }
126
146
}
125
}
127
147
126
128
=== modified file 'Simple/KeyboardButton.qml'
129
--- Simple/KeyboardButton.qml	2013-06-11 19:33:52 +0000
130
+++ Simple/KeyboardButton.qml	2013-09-11 10:39:56 +0000
131
@@ -46,7 +46,6 @@
132
46
            anchors.centerIn: parent
46
            anchors.centerIn: parent
133
47
            color: "#7474AC"
47
            color: "#7474AC"
134
48
            font.pixelSize: (calcGridUnit*3)
48
            font.pixelSize: (calcGridUnit*3)
135
49
            font.family: "Ubuntu"
136
50
            font.bold: true
49
            font.bold: true
137
51
        }
50
        }
138
52
51
139
53
52
140
=== modified file 'Simple/Screen.qml'
141
--- Simple/Screen.qml	2013-09-10 17:00:58 +0000
142
+++ Simple/Screen.qml	2013-09-11 10:39:56 +0000
143
@@ -30,10 +30,10 @@
144
30
30
145
31
    property var ops
31
    property var ops
146
32
    property bool newCalculation: false
32
    property bool newCalculation: false
147
33
    property bool labelVisible: false
148
33
    signal useAnswer(string answerToUse, string formulaData)
34
    signal useAnswer(string answerToUse, string formulaData)
149
34
    signal labelTextUpdated(int idx, string newText)
35
    signal labelTextUpdated(int idx, string newText)
150
35
    signal mainLabelUpdated(int idx, string newText)
36
    signal mainLabelUpdated(int idx, string newText)
151
36
    signal dateUpdate(int idx)
152
37
    signal removeItem()
37
    signal removeItem()
153
38
38
154
39
    Item {
39
    Item {
155
@@ -62,7 +62,6 @@
156
62
                color: "#9094AA"
62
                color: "#9094AA"
157
63
                text: _content.x > root.width / 3 ? "Release To Delete" : "Pull To Delete"
63
                text: _content.x > root.width / 3 ? "Release To Delete" : "Pull To Delete"
158
64
                font.italic: true
64
                font.italic: true
159
65
                font.family: "Ubuntu"
160
66
            }
65
            }
161
67
        }
66
        }
162
68
    }
67
    }
163
@@ -94,7 +93,6 @@
164
94
                color: "#9094AA"
93
                color: "#9094AA"
165
95
                text: _content.x < -root.width / 3 ? "Release To Delete" : "Pull To Delete"
94
                text: _content.x < -root.width / 3 ? "Release To Delete" : "Pull To Delete"
166
96
                font.italic: true
95
                font.italic: true
167
97
                font.family: "Ubuntu"
168
98
            }
96
            }
169
99
        }
97
        }
170
100
    }
98
    }
171
@@ -114,7 +112,6 @@
172
114
            Text {
112
            Text {
173
115
                width: parent.width
113
                width: parent.width
174
116
                horizontalAlignment: Text.AlignHCenter
114
                horizontalAlignment: Text.AlignHCenter
175
117
                font.family: "Ubuntu"
176
118
                color: "#FFFFFF"
115
                color: "#FFFFFF"
177
119
116
178
120
                text: i18n.tr("Delete this calculation?")
117
                text: i18n.tr("Delete this calculation?")
179
@@ -145,28 +142,11 @@
180
145
            id: inputs
142
            id: inputs
181
146
            anchors.top: parent.top
143
            anchors.top: parent.top
182
147
            anchors.topMargin: units.gu(2)
144
            anchors.topMargin: units.gu(2)
184
148
            width: parent.width - units.gu(4)
145
            width: parent.width - units.gu(3)
185
149
            anchors.centerIn: parent
146
            anchors.centerIn: parent
186
150
147
206
151
            // Every five minutes update date label
148
            //Edit Button icon and time in parent line
207
152
            Timer {
149
            Item {
189
153
                interval: 300000
190
154
                repeat: true
191
155
                running: true
192
156
                onTriggered: root.dateUpdate(index)
193
157
            }
194
158
195
159
            Text {
196
160
                id: dateLabel
197
161
                width: parent.width
198
162
                color: "#9094AA"
199
163
                text: dateText
200
164
                font.italic: true
201
165
                font.family: "Ubuntu"
202
166
            }
203
167
204
168
            //Edit Button icon in parent line
205
169
            Row{
208
170
                id: row
150
                id: row
209
171
                height: units.gu(4)
151
                height: units.gu(4)
210
172
                width: parent.width
152
                width: parent.width
211
@@ -185,12 +165,13 @@
212
185
                        onClicked: {
165
                        onClicked: {
213
186
                            title.focus = true;
166
                            title.focus = true;
214
187
                            title.forceActiveFocus();
167
                            title.forceActiveFocus();
215
168
                            labelVisible = true
216
188
                            calcKeyboardVisible = false;
169
                            calcKeyboardVisible = false;
217
189
                        }
170
                        }
218
190
                    }
171
                    }
219
191
                }
172
                }
220
192
                Item {
173
                Item {
222
193
                    width: parent.width
174
                    width: parent.width / 2
223
194
                    height: parent.height
175
                    height: parent.height
224
195
176
225
196
                    TextField {
177
                    TextField {
226
@@ -198,6 +179,7 @@
227
198
                        objectName: "title"
179
                        objectName: "title"
228
199
                        width: parent.width
180
                        width: parent.width
229
200
                        anchors.verticalCenter: parent.verticalCenter
181
                        anchors.verticalCenter: parent.verticalCenter
230
182
                        x: units.gu(3)
231
201
                        // removes ubuntu shape
183
                        // removes ubuntu shape
232
202
                        style: TextFieldStyle {
184
                        style: TextFieldStyle {
233
203
                            background: Item {}
185
                            background: Item {}
234
@@ -208,15 +190,20 @@
235
208
                        hasClearButton: false
190
                        hasClearButton: false
236
209
                        font.pixelSize: FontUtils.sizeToPixels("medium")
191
                        font.pixelSize: FontUtils.sizeToPixels("medium")
237
210
192
238
193
                        maximumLength: 20;
239
194
240
211
                        onActiveFocusChanged: {
195
                        onActiveFocusChanged: {
243
212
                            if (title.activeFocus)
196
                            if (title.activeFocus) {
244
213
                                calcKeyboardVisible = false
197
                                labelVisible = true;
245
198
                                calcKeyboardVisible = false;
246
199
                            }
247
214
                        }
200
                        }
248
215
201
249
216
                        InverseMouseArea {
202
                        InverseMouseArea {
250
217
                            onClicked: {
203
                            onClicked: {
251
218
                                title.focus = false;
204
                                title.focus = false;
252
219
                                mouse.accepted = false;
205
                                mouse.accepted = false;
253
206
                                labelVisible = false;
254
220
                                calcKeyboardVisible = true;
207
                                calcKeyboardVisible = true;
255
221
                            }
208
                            }
256
222
                            anchors.fill: parent;
209
                            anchors.fill: parent;
257
@@ -226,14 +213,24 @@
258
226
                    }
213
                    }
259
227
214
260
228
                    Image {
215
                    Image {
262
229
                        visible: title.focus
216
                        visible: labelVisible
263
230
                        anchors.bottom: parent.bottom
217
                        anchors.bottom: parent.bottom
264
218
                        x: units.gu(3)
265
231
                        source: Qt.resolvedUrl("images/dot.png")
219
                        source: Qt.resolvedUrl("images/dot.png")
266
232
                        fillMode: Image.Tile
220
                        fillMode: Image.Tile
269
233
                        width: parent.width-units.gu(1)
221
                        width: parent.width - units.gu(1.5)
270
234
                        height: units.gu(1)/2
222
                        height: units.gu(0.5)
271
235
                    }
223
                    }
272
236
                }
224
                }
273
225
274
226
                Label {
275
227
                    id: dateLabel
276
228
                    height: parent.height
277
229
                    anchors.right: parent.right
278
230
                    color: "#9094AA"
279
231
                    text: dateText
280
232
                    font.capitalization: Font.AllUppercase
281
233
                }
282
237
            }
234
            }
283
238
235
284
239
            Repeater{
236
            Repeater{
285
240
237
286
=== modified file 'Simple/SimplePage.qml'
287
--- Simple/SimplePage.qml	2013-09-10 17:00:58 +0000
288
+++ Simple/SimplePage.qml	2013-09-11 10:39:56 +0000
289
@@ -20,7 +20,6 @@
290
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 0.1
291
21
import "../engine.js" as CALC
21
import "../engine.js" as CALC
292
22
import "../formula.js" as F
22
import "../formula.js" as F
293
23
import "../dateutils.js" as DateUtils
294
24
23
295
25
Page {
24
Page {
296
26
25
297
@@ -139,7 +138,7 @@
298
139
                    if (memory.get(0).mainLabel.length === 0)
138
                    if (memory.get(0).mainLabel.length === 0)
299
140
                        memory.get(0).mainLabel = '';
139
                        memory.get(0).mainLabel = '';
300
141
                    memory.get(0).isLastItem = false
140
                    memory.get(0).isLastItem = false
302
142
                    memory.get(0).dateText = i18n.tr("A few seconds ago...")
141
                    memory.get(0).dateText = Qt.formatDateTime(currentDate, i18n.tr("dd MMM yy, hh:mm"))
303
143
                    memory.get(0).timeStamp = currentDate.getTime()
142
                    memory.get(0).timeStamp = currentDate.getTime()
304
144
                    memory.setProperty(0, "timeStamp", currentDate.getTime());
143
                    memory.setProperty(0, "timeStamp", currentDate.getTime());
305
145
                    memory.insert(0,{'dbId': -1, 'dateText': "", 'operators': [{_text:'', _operation:'', _number:''}], 'isLastItem': true, 'mainLabel': ''});
144
                    memory.insert(0,{'dbId': -1, 'dateText': "", 'operators': [{_text:'', _operation:'', _number:''}], 'isLastItem': true, 'mainLabel': ''});
306
@@ -149,11 +148,13 @@
307
149
                }
148
                }
308
150
            }
149
            }
309
151
150
315
152
            function showError() {
151
316
153
                animateError.start()
152
// Only for Scientific Calculator
317
154
            }
153
//            function showError() {
318
155
154
//                animateError.start()
319
156
            PropertyAnimation {id: animateError; target: formulaView; properties: "color"; from: "#FFA0A0"; to: "#FFFFFF"; duration: 100}
155
//            }
320
156
321
157
//            PropertyAnimation {id: animateError; target: formulaView; properties: "color"; from: "#FFA0A0"; to: "#FFFFFF"; duration: 100}
322
157
158
323
158
            remove: Transition{
159
            remove: Transition{
324
159
                NumberAnimation {property: "opacity"; to: 0; duration: 200 }
160
                NumberAnimation {property: "opacity"; to: 0; duration: 200 }
325
@@ -196,16 +197,6 @@
326
196
                    memory.get(index).mainLabel = newText;
197
                    memory.get(index).mainLabel = newText;
327
197
                }
198
                }
328
198
199
329
199
                // Update date label
330
200
                onDateUpdate: {
331
201
                    // If is in database
332
202
                    if (memory.get(index).dbId !== -1)
333
203
                        memory.get(index).dateText = DateUtils.formatRelativeTime(i18n, storage.fromIdToDate(memory.get(index).dbId));
334
204
                    // If is in memory but not in database
335
205
                    else if (memory.get(index).timeStamp)
336
206
                        memory.get(index).dateText = DateUtils.formatRelativeTime(i18n, memory.get(index).timeStamp);
337
207
                }
338
208
339
209
                onLabelTextUpdated: {
200
                onLabelTextUpdated: {
340
210
                    if(index === 0){
201
                    if(index === 0){
341
211
                        screenFormula[idx]._text = newText;
202
                        screenFormula[idx]._text = newText;
342
212
203
343
=== modified file 'Storage.qml'
344
--- Storage.qml	2013-08-29 13:15:11 +0000
345
+++ Storage.qml	2013-09-11 10:39:56 +0000
346
@@ -18,7 +18,6 @@
347
18
18
348
19
import QtQuick 2.0
19
import QtQuick 2.0
349
20
import QtQuick.LocalStorage 2.0
20
import QtQuick.LocalStorage 2.0
350
21
import "./dateutils.js" as DateUtils
351
22
21
352
23
Item {
22
Item {
353
24
    property var db: null
23
    property var db: null
354
@@ -83,7 +82,7 @@
355
83
                        for(var i=res.rows.length - 1; i >= 0; i--){
82
                        for(var i=res.rows.length - 1; i >= 0; i--){
356
84
                            var obj = JSON.parse(res.rows.item(i).calc);
83
                            var obj = JSON.parse(res.rows.item(i).calc);
357
85
                            obj.dbId = res.rows.item(i).id;
84
                            obj.dbId = res.rows.item(i).id;
359
86
                            obj.dateText  = DateUtils.formatRelativeTime(i18n, res.rows.item(i).insertDate);
85
                            obj.dateText = Qt.formatDateTime(parseDate(res.rows.item(i).insertDate), i18n.tr("dd MMM yy, hh:mm"))
360
87
86
361
88
                            if (!('mainLabel' in obj))
87
                            if (!('mainLabel' in obj))
362
89
                                obj.mainLabel = ''
88
                                obj.mainLabel = ''
363
@@ -94,6 +93,10 @@
364
94
                    );
93
                    );
365
95
    }
94
    }
366
96
95
367
96
    function parseDate(dateAsStr) {
368
97
        return new Date(dateAsStr);
369
98
    }
370
99
371
97
    function saveCalculations(calculations){
100
    function saveCalculations(calculations){
372
98
        openDB();
101
        openDB();
373
99
        var res;
102
        var res;
374
100
103
375
=== modified file 'bignumber.js'
376
--- bignumber.js	2013-07-16 17:28:19 +0000
377
+++ bignumber.js	2013-09-11 10:39:56 +0000
378
@@ -55,8 +55,9 @@
379
55
        TO_EXP_NEG = -7,                             // 0 to -MAX
55
        TO_EXP_NEG = -7,                             // 0 to -MAX
380
56
56
381
57
        // The exponent value at and above which toString returns exponential notation.
57
        // The exponent value at and above which toString returns exponential notation.
384
58
        // Number type: 21
58
        // Number type: 11
385
59
        TO_EXP_POS = 21,                             // 0 to MAX
59
        // Default: 21
386
60
        TO_EXP_POS = 11,                             // 0 to MAX
387
60
61
388
61
        // RANGE : [MIN_EXP, MAX_EXP]
62
        // RANGE : [MIN_EXP, MAX_EXP]
389
62
63
390
@@ -158,9 +159,9 @@
391
158
                    if ( j = new RegExp( '^' + i + '(?:\\.' + i + ')?$', 'i' ).test(n) ) {
159
                    if ( j = new RegExp( '^' + i + '(?:\\.' + i + ')?$', 'i' ).test(n) ) {
392
159
160
393
160
                        if ( isNum ) {
161
                        if ( isNum ) {
395
161
                            if ( n.replace('.', '').length > 15 ) {
162
                            if ( n.replace('.', '').length > 11 ) {
396
162
163
398
163
                                // 'new BigNumber() number type has more than 15 significant digits: {n}'
164
                                // 'new BigNumber() number type has more than 11 significant digits: {n}'
399
164
                                ifExceptionsThrow( n, 0 )
165
                                ifExceptionsThrow( n, 0 )
400
165
                            }
166
                            }
401
166
167
402
@@ -230,10 +231,10 @@
403
230
            i = n.length
231
            i = n.length
404
231
        }
232
        }
405
232
233
408
233
        // Disallow numbers over 15 digits if number type.
234
        // Disallow numbers over 11 digits if number type.
409
234
        if ( b = n.length, isNum && b > 15 ) {
235
        if ( b = n.length, isNum && b > 11 ) {
410
235
236
412
236
            // 'new BigNumber() number type has more than 15 significant digits: {n}'
237
            // 'new BigNumber() number type has more than 11 significant digits: {n}'
413
237
            ifExceptionsThrow( n, 0 )
238
            ifExceptionsThrow( n, 0 )
414
238
        }
239
        }
415
239
240
416
@@ -411,7 +412,7 @@
417
411
                  ( isRange ? ' non-zero' : 'n' ) + ' integer';
412
                  ( isRange ? ' non-zero' : 'n' ) + ' integer';
418
412
413
419
413
            error = ( [
414
            error = ( [
421
414
                method + ' number type has more than 15 significant digits',
415
                method + ' number type has more than 11 significant digits',
422
415
                method + ' not a base ' + j + ' number',
416
                method + ' not a base ' + j + ' number',
423
416
                method + ' base' + error,
417
                method + ' base' + error,
424
417
                method + ' not a number' ][i] ||
418
                method + ' not a number' ][i] ||
425
418
419
426
=== removed file 'dateutils.js'
427
--- dateutils.js	2013-07-30 17:06:03 +0000
428
+++ dateutils.js	1970-01-01 00:00:00 +0000
429
@@ -1,99 +0,0 @@
430
1
/*
431
2
 * Copyright 2013 Canonical Ltd.
432
3
 *
433
4
 * This file is part of ubuntu-rssreader-app.
434
5
 *
435
6
 * ubuntu-calculator-app is free software; you can redistribute it and/or modify
436
7
 * it under the terms of the GNU General Public License as published by
437
8
 * the Free Software Foundation; version 3.
438
9
 *
439
10
 * ubuntu-calculator-app is distributed in the hope that it will be useful,
440
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
441
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
442
13
 * GNU General Public License for more details.
443
14
 *
444
15
 * You should have received a copy of the GNU General Public License
445
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
446
17
 */
447
18
448
19
.pragma library
449
20
450
21
var SECONDS_LIMIT = 60 * 1000;             // used as reference
451
22
var MINUTES_LIMIT = 60 * SECONDS_LIMIT;    // print minutes up to 1h
452
23
var HOURS_LIMIT = 12 * MINUTES_LIMIT;      // print hours up to 12h
453
24
var DAY_LIMIT = 24 * MINUTES_LIMIT;        // print '<val> days ago' up to 30 days back
454
25
var DAYS_LIMIT = 30 * DAY_LIMIT;           // print '<val> days ago' up to 30 days back
455
26
456
27
function parseDate(dateAsStr) {
457
28
    return new Date(dateAsStr);
458
29
}
459
30
460
31
function formatRelativeTime(i18n, dateAsStr) {
461
32
    // fallback if none of the other formatters matched
462
33
    function defaultFallbackFormat(then) {
463
34
        return Qt.formatDateTime(then, i18n.tr("MMMM d"))
464
35
    }
465
36
466
37
    // Simple matches all diffs < limit, formats using the format function.
467
38
    function SimpleFormatter(limit, format) {
468
39
        this.matches = function (now, then, diff) { return diff < limit }
469
40
        this.format = format
470
41
    }
471
42
472
43
    // Matches yesterday date
473
44
    function YesterdayFormatter() {
474
45
        this.matches = function (now, then, diff) {
475
46
            return diff < DAY_LIMIT && now.getDate() !== then.getDate();
476
47
        }
477
48
        this.format = function (now, then, diff) {
478
49
            return i18n.tr("Yesterday at %1").arg(
479
50
                        Qt.formatDateTime(then, i18n.tr("h:mm AP")))
480
51
        }
481
52
    }
482
53
483
54
    // Matches up to 7 days ago (formats date as a weekday + time)
484
55
    function WeekFormatter() {
485
56
        this.matches = function (now, then, diff) {
486
57
            return diff < 7 * DAY_LIMIT
487
58
        }
488
59
        this.format = function (now, then, diff) {
489
60
            return Qt.formatDateTime(then, i18n.tr("ddd, h:mm AP"));
490
61
        }
491
62
    }
492
63
493
64
    // An array of formatting object processed from 0 up to a matching object.
494
65
    // If none of the object matches a default fallback formatter will be used.
495
66
    var FORMATTERS = [
496
67
                new SimpleFormatter(SECONDS_LIMIT, function (now, then, diff) { return i18n.tr("A few seconds ago...") }),
497
68
                new SimpleFormatter(MINUTES_LIMIT, function (now, then, diff) {
498
69
                    var val = Math.floor(diff / SECONDS_LIMIT)
499
70
                    return i18n.tr("%1 minute ago", "%1 minutes ago", val).arg(val)
500
71
                }),
501
72
                new SimpleFormatter(HOURS_LIMIT, function (now, then, diff) {
502
73
                    var val = Math.floor(diff / MINUTES_LIMIT)
503
74
                    return i18n.tr("%1 hour ago", "%1 hours ago", val).arg(val)
504
75
                }),
505
76
                new YesterdayFormatter(),
506
77
                new WeekFormatter(),
507
78
                new SimpleFormatter(DAYS_LIMIT, function (now, then, diff) {
508
79
                    var val = Math.floor(diff / DAY_LIMIT)
509
80
                    return i18n.tr("%1 day ago", "%1 days ago", val).arg(val)
510
81
                })
511
82
            ]
512
83
513
84
    function formatDiff(now, then, diff) {
514
85
        for (var i=0; i<FORMATTERS.length; ++i) {
515
86
            var formatter = FORMATTERS[i]
516
87
            if (formatter.matches(now, then, diff)) {
517
88
                return formatter.format(now, then, diff)
518
89
            }
519
90
        }
520
91
        return defaultFallbackFormat(then)
521
92
    }
522
93
523
94
    var now = new Date();
524
95
    var then = parseDate(dateAsStr);
525
96
    var diff = now - then;
526
97
    var formattedDiff = formatDiff(now, then, diff);
527
98
    return formattedDiff;
528
99
}
529
100
0
530
=== modified file 'engine.js'
531
--- engine.js	2013-07-16 17:28:19 +0000
532
+++ engine.js	2013-09-11 10:39:56 +0000
533
@@ -23,7 +23,9 @@
534
23
23
535
24
// ----------------------------------------
24
// ----------------------------------------
536
25
// constants (const keyword is not working)
25
// constants (const keyword is not working)
538
26
var MAX_DECIMAL = 13; // Number of maximum decimal positions
26
var MAX_DECIMAL = 5; // Number of maximum decimal positions
539
27
var PRECISION = 8 // Max lenght of result in exponential mode
540
28
var MAX_LENGHT = 100000000000 // Highest number before exponential mode
541
27
29
542
28
var RAD = 0, DEG = 1, GRAD = 2; //Trigonometric functions
30
var RAD = 0, DEG = 1, GRAD = 2; //Trigonometric functions
543
29
31
544
@@ -544,27 +546,34 @@
545
544
546
546
545
    op: function op(type, lhs, rhs) {
547
    op: function op(type, lhs, rhs) {
547
546
        if (lhs !== null) {
548
        if (lhs !== null) {
548
549
            var result;
549
547
            switch (type) {
550
            switch (type) {
550
548
            case T_PLUS:
551
            case T_PLUS:
552
549
                return lhs.value.plus(rhs.value);
552
                result = lhs.value.plus(rhs.value);
553
553
                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
554
550
554
555
551
            case T_MINUS:
555
            case T_MINUS:
557
552
                return lhs.value.minus(rhs.value);
556
                result = lhs.value.minus(rhs.value);
558
557
                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
559
553
558
560
554
            case T_TIMES:
559
            case T_TIMES:
562
555
                return lhs.value.times(rhs.value);
560
                result = lhs.value.times(rhs.value);
563
561
                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
564
556
562
565
557
            case T_DIV:
563
            case T_DIV:
567
558
                return lhs.value.div(rhs.value);
564
                result = lhs.value.div(rhs.value);
568
565
                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
569
559
566
570
560
            case T_MOD:
567
            case T_MOD:
571
561
                if (rhs.value === 0.)
568
                if (rhs.value === 0.)
572
562
                    throw new DivisionByZeroError('modulo division by zero');
569
                    throw new DivisionByZeroError('modulo division by zero');
573
563
570
575
564
                return lhs.value.mod(rhs.value);
571
                result = lhs.value.mod(rhs.value);
576
572
                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
577
565
573
578
566
            case T_POW:
574
            case T_POW:
580
567
                return lhs.value.pow(rhs.value);
575
                result = lhs.value.pow(rhs.value);
581
576
                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
582
568
            }
577
            }
583
569
578
584
570
            // throw?
579
            // throw?
Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)			Approve on 2013-09-12
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-09-11
Nekhelesh Ramananthan (community)			Needs Information on 2013-09-10
Mihir Soni		2013-09-07	Needs Fixing on 2013-09-10
Review via email: mp+184440@code.launchpad.net