1
=== modified file 'debian/control'
2
--- debian/control	2015-04-07 17:11:13 +0000
3
+++ debian/control	2015-04-07 17:11:13 +0000
4
@@ -36,6 +36,7 @@
5
36
         fonts-liberation,
36
         fonts-liberation,
6
37
         liboxideqt-qmlplugin (>= 1.5),
37
         liboxideqt-qmlplugin (>= 1.5),
7
38
         libqt5sql5-sqlite,
38
         libqt5sql5-sqlite,
8
39
         qml-module-qt-labs-folderlistmodel,
9
39
         qml-module-qt-labs-settings,
40
         qml-module-qt-labs-settings,
10
40
         qml-module-qtquick2 (>= 5.4) | qtdeclarative5-qtquick2-plugin (>= 5.4),
41
         qml-module-qtquick2 (>= 5.4) | qtdeclarative5-qtquick2-plugin (>= 5.4),
11
41
         qml-module-qtquick-dialogs | qtdeclarative5-dialogs-plugin,
42
         qml-module-qtquick-dialogs | qtdeclarative5-dialogs-plugin,
12
42
43
13
=== modified file 'src/app/webbrowser/AddressBar.qml'
14
--- src/app/webbrowser/AddressBar.qml	2015-03-25 14:12:12 +0000
15
+++ src/app/webbrowser/AddressBar.qml	2015-04-07 17:11:13 +0000
16
@@ -21,6 +21,7 @@
17
21
import Ubuntu.Components.Popups 1.0
21
import Ubuntu.Components.Popups 1.0
18
22
import com.canonical.Oxide 1.0 as Oxide
22
import com.canonical.Oxide 1.0 as Oxide
19
23
import ".."
23
import ".."
20
24
import "urlManagement.js" as UrlManagement
21
24
25
22
25
FocusScope {
26
FocusScope {
23
26
    id: addressbar
27
    id: addressbar
24
@@ -88,7 +89,7 @@
25
88
89
26
89
                    readonly property bool reload: addressbar.activeFocus && addressbar.text &&
90
                    readonly property bool reload: addressbar.activeFocus && addressbar.text &&
27
90
                                                   (addressbar.text == addressbar.actualUrl)
91
                                                   (addressbar.text == addressbar.actualUrl)
29
91
                    readonly property bool looksLikeAUrl: internal.looksLikeAUrl(addressbar.text.trim())
92
                    readonly property bool looksLikeAUrl: UrlManagement.looksLikeAUrl(addressbar.text.trim())
30
92
93
31
93
                    name: addressbar.loading ? "stop" :
94
                    name: addressbar.loading ? "stop" :
32
94
                          reload ? "reload" :
95
                          reload ? "reload" :
33
@@ -235,38 +236,6 @@
34
235
236
35
236
        property var securityCertificateDetails: null
237
        property var securityCertificateDetails: null
36
237
238
37
238
        function looksLikeAUrl(address) {
38
239
            var terms = address.split(/\s/)
39
240
            if (terms.length > 1) {
40
241
                return false
41
242
            }
42
243
            if (address.substr(0, 1) == "/") {
43
244
                return true
44
245
            }
45
246
            if (address.match(/^https?:\/\//i) ||
46
247
                address.match(/^file:\/\//i) ||
47
248
                address.match(/^[a-z]+:\/\//i)) {
48
249
                return true
49
250
            }
50
251
            if (address.split('/', 1)[0].match(/\.[a-zA-Z]{2,4}$/)) {
51
252
                return true
52
253
            }
53
254
            if (address.split('/', 1)[0].match(/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}/)) {
54
255
                return true
55
256
            }
56
257
            return false
57
258
        }
58
259
59
260
        function fixUrl(address) {
60
261
            var url = address
61
262
            if (address.substr(0, 1) == "/") {
62
263
                url = "file://" + address
63
264
            } else if (address.indexOf("://") == -1) {
64
265
                url = "http://" + address
65
266
            }
66
267
            return url
67
268
        }
68
269
69
270
        function escapeHtmlEntities(query) {
239
        function escapeHtmlEntities(query) {
70
271
            return query.replace(/\W/, encodeURIComponent)
240
            return query.replace(/\W/, encodeURIComponent)
71
272
        }
241
        }
72
@@ -278,8 +247,8 @@
73
278
247
74
279
        function validate() {
248
        function validate() {
75
280
            var query = text.trim()
249
            var query = text.trim()
78
281
            if (internal.looksLikeAUrl(query)) {
250
            if (UrlManagement.looksLikeAUrl(query)) {
79
282
                requestedUrl = internal.fixUrl(query)
251
                requestedUrl = UrlManagement.fixUrl(query)
80
283
            } else {
252
            } else {
81
284
                requestedUrl = internal.buildSearchUrl(query)
253
                requestedUrl = internal.buildSearchUrl(query)
82
285
            }
254
            }
83
286
255
84
=== modified file 'src/app/webbrowser/Browser.qml'
85
--- src/app/webbrowser/Browser.qml	2015-04-07 17:11:13 +0000
86
+++ src/app/webbrowser/Browser.qml	2015-04-07 17:11:13 +0000
87
@@ -102,6 +102,7 @@
88
102
102
89
103
    Item {
103
    Item {
90
104
        anchors.fill: parent
104
        anchors.fill: parent
91
105
        visible: !settingsContainer.visible && !historyViewContainer.visible
92
105
106
93
106
        TabChrome {
107
        TabChrome {
94
107
            id: invisibleTabChrome
108
            id: invisibleTabChrome
95
@@ -245,6 +246,12 @@
96
245
                    iconName: "tab-new"
246
                    iconName: "tab-new"
97
246
                    enabled: formFactor != "mobile"
247
                    enabled: formFactor != "mobile"
98
247
                    onTriggered: browser.openUrlInNewTab("", true)
248
                    onTriggered: browser.openUrlInNewTab("", true)
99
249
                },
100
250
                Action {
101
251
                    objectName: "settings"
102
252
                    text: i18n.tr("Settings")
103
253
                    iconName: "settings"
104
254
                    onTriggered: settingsComponent.createObject(settingsContainer)
105
248
                }
255
                }
106
249
            ]
256
            ]
107
250
        }
257
        }
108
@@ -478,6 +485,24 @@
109
478
        }
485
        }
110
479
    }
486
    }
111
480
487
112
488
    Item {
113
489
        id: settingsContainer
114
490
115
491
        visible: children.length > 0
116
492
        anchors.fill: parent
117
493
118
494
        Component {
119
495
            id: settingsComponent
120
496
121
497
            SettingsPage {
122
498
                anchors.fill: parent
123
499
                historyModel: browser.historyModel
124
500
                settingsObject: settings
125
501
                onDone: destroy()
126
502
            }
127
503
        }
128
504
    }
129
505
130
481
    TabsModel {
506
    TabsModel {
131
482
        id: tabsModel
507
        id: tabsModel
132
483
508
133
484
509
134
=== modified file 'src/app/webbrowser/CMakeLists.txt'
135
--- src/app/webbrowser/CMakeLists.txt	2015-04-07 17:11:13 +0000
136
+++ src/app/webbrowser/CMakeLists.txt	2015-04-07 17:11:13 +0000
137
@@ -42,7 +42,7 @@
138
42
install(TARGETS ${WEBBROWSER_APP}
42
install(TARGETS ${WEBBROWSER_APP}
139
43
        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
43
        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
140
44
44
142
45
file(GLOB QML_FILES *.qml)
45
file(GLOB QML_FILES *.qml *.js)
143
46
install(FILES ${QML_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webbrowser)
46
install(FILES ${QML_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webbrowser)
144
47
47
145
48
install(DIRECTORY assets
48
install(DIRECTORY assets
146
49
49
147
=== added file 'src/app/webbrowser/SettingsPage.qml'
148
--- src/app/webbrowser/SettingsPage.qml	1970-01-01 00:00:00 +0000
149
+++ src/app/webbrowser/SettingsPage.qml	2015-04-07 17:11:13 +0000
150
@@ -0,0 +1,277 @@
151
1
/*
152
2
 * Copyright 2015 Canonical Ltd.
153
3
 *
154
4
 * This file is part of webbrowser-app.
155
5
 *
156
6
 * webbrowser-app is free software; you can redistribute it and/or modify
157
7
 * it under the terms of the GNU General Public License as published by
158
8
 * the Free Software Foundation; version 3.
159
9
 *
160
10
 * webbrowser-app is distributed in the hope that it will be useful,
161
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
162
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
163
13
 * GNU General Public License for more details.
164
14
 *
165
15
 * You should have received a copy of the GNU General Public License
166
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
167
17
 */
168
18
169
19
import QtQuick 2.0
170
20
import Qt.labs.folderlistmodel 2.1
171
21
import Qt.labs.settings 1.0
172
22
import Ubuntu.Components 1.1
173
23
import Ubuntu.Components.Popups 1.0
174
24
import Ubuntu.Components.ListItems 1.0 as ListItem
175
25
import Ubuntu.Web 0.2
176
26
import webbrowserapp.private 0.1
177
27
178
28
import "urlManagement.js" as UrlManagement
179
29
180
30
Item {
181
31
    id: settingsItem
182
32
183
33
    property QtObject historyModel
184
34
    property Settings settingsObject
185
35
186
36
    signal done()
187
37
188
38
    Rectangle {
189
39
        anchors.fill: parent
190
40
        color: "#f6f6f6"
191
41
    }
192
42
193
43
    FolderListModel {
194
44
        id: searchEngineFolder
195
45
        folder: dataLocation +"/searchengines"
196
46
        showDirs: false
197
47
        nameFilters: ["*.xml"]
198
48
        sortField: FolderListModel.Name
199
49
    }
200
50
201
51
    SettingsPageHeader {
202
52
        id: title
203
53
204
54
        onBack: settingsItem.done()
205
55
        text: i18n.tr("Settings")
206
56
        visible: !subpageContainer.visible
207
57
    }
208
58
209
59
    Flickable {
210
60
        anchors {
211
61
            top: title.bottom
212
62
            left: parent.left
213
63
            right: parent.right
214
64
            bottom: parent.bottom
215
65
        }
216
66
217
67
        visible: !subpageContainer.visible
218
68
        clip: true
219
69
        contentHeight: settingsCol.height
220
70
221
71
        Column {
222
72
            id: settingsCol
223
73
224
74
            width: parent.width
225
75
226
76
            ListItem.Subtitled {
227
77
                SearchEngine {
228
78
                    id: currentSearchEngine
229
79
                    filename: settingsObject.searchEngine
230
80
                }
231
81
                text: i18n.tr("Search engine")
232
82
                subText: currentSearchEngine.name
233
83
234
84
                visible: searchEngineFolder.count > 1
235
85
236
86
                onClicked: searchEngineComponent.createObject(subpageContainer);
237
87
            }
238
88
239
89
            ListItem.Subtitled {
240
90
                text: i18n.tr("Homepage")
241
91
                subText: settingsObject.homepage
242
92
243
93
                onClicked: PopupUtils.open(homepageDialog)
244
94
            }
245
95
246
96
            ListItem.Standard {
247
97
                text: i18n.tr("Restore previous session at startup")
248
98
                highlightWhenPressed: false
249
99
250
100
                control: Switch {
251
101
                    id: restoreSessionSwitch
252
102
                    onClicked: settingsObject.restoreSession = checked;
253
103
                }
254
104
255
105
                Binding {
256
106
                    target: restoreSessionSwitch; property: "checked";
257
107
                    value: settingsObject.restoreSession
258
108
                }
259
109
            }
260
110
261
111
            ListItem.Standard {
262
112
                text: i18n.tr("Allow opening new tabs in background")
263
113
                highlightWhenPressed: false
264
114
265
115
                control: Switch {
266
116
                    id: allowOpenInBackgroundTabSwitch
267
117
268
118
                    onClicked: settingsObject.allowOpenInBackgroundTab = checked ? 'true' : 'false';
269
119
                }
270
120
271
121
                Binding {
272
122
                    target: allowOpenInBackgroundTabSwitch; property: "checked";
273
123
                    value: settingsObject.allowOpenInBackgroundTab === 'true' ||
274
124
                    (settingsObject.allowOpenInBackgroundTab === 'default' &&
275
125
                        formFactor === "desktop")
276
126
                }
277
127
            }
278
128
279
129
            ListItem.Standard {
280
130
                text: i18n.tr("Privacy")
281
131
282
132
                onClicked: privacyComponent.createObject(subpageContainer);
283
133
            }
284
134
285
135
            ListItem.Standard {
286
136
                text: i18n.tr("Reset browser settings")
287
137
                onClicked: settingsObject.restoreDefaults();
288
138
            }
289
139
        }
290
140
    }
291
141
292
142
    Item {
293
143
        id: subpageContainer
294
144
295
145
        visible: children.length > 0
296
146
        anchors.fill: parent
297
147
298
148
        Component {
299
149
            id: searchEngineComponent
300
150
301
151
            Item {
302
152
                id: searchEngineItem
303
153
                anchors.fill: parent
304
154
305
155
                Rectangle {
306
156
                    anchors.fill: parent
307
157
                    color: "#f6f6f6"
308
158
                }
309
159
310
160
                SettingsPageHeader {
311
161
                    id: searchEngineTitle
312
162
313
163
                    onBack: searchEngineItem.destroy();
314
164
                    text: i18n.tr("Search engine")
315
165
                }
316
166
317
167
                ListView {
318
168
                    anchors {
319
169
                        top: searchEngineTitle.bottom
320
170
                        left: parent.left
321
171
                        right: parent.right
322
172
                        bottom: parent.bottom
323
173
                    }
324
174
325
175
                    model: searchEngineFolder
326
176
327
177
                    delegate: ListItem.Standard {
328
178
                        SearchEngine {
329
179
                            id: searchEngineDelegate
330
180
                            filename: model.fileBaseName
331
181
                        }
332
182
                        text: searchEngineDelegate.name
333
183
334
184
                        control: CheckBox {
335
185
                            checked: settingsObject.searchEngine == searchEngineDelegate.filename;
336
186
                            onClicked: {
337
187
                                settingsObject.searchEngine = searchEngineDelegate.filename;
338
188
                                searchEngineItem.destroy();
339
189
                            }
340
190
                        }
341
191
                    }
342
192
                }
343
193
            }
344
194
        }
345
195
346
196
        Component {
347
197
            id: privacyComponent
348
198
349
199
            Item {
350
200
                id: privacyItem
351
201
                anchors.fill: parent
352
202
353
203
                Rectangle {
354
204
                    anchors.fill: parent
355
205
                    color: "#f6f6f6"
356
206
                }
357
207
358
208
                SettingsPageHeader {
359
209
                    id: privacyTitle
360
210
                    onBack: privacyItem.destroy();
361
211
                    text: i18n.tr("Privacy")
362
212
                }
363
213
364
214
                Flickable {
365
215
                    anchors {
366
216
                        top: privacyTitle.bottom
367
217
                        left: parent.left
368
218
                        right: parent.right
369
219
                        bottom: parent.bottom
370
220
                    }
371
221
372
222
                    clip: true
373
223
374
224
                    contentHeight: privacyCol.height
375
225
376
226
                    Column {
377
227
                        id: privacyCol
378
228
                        width: parent.width
379
229
380
230
                        ListItem.Standard {
381
231
                            text: i18n.tr("Clear Browsing History")
382
232
                            onClicked: historyModel.clearAll();
383
233
                            enabled: historyModel.count > 0
384
234
                        }
385
235
                    }
386
236
                }
387
237
            }
388
238
        }
389
239
    }
390
240
391
241
    Component {
392
242
        id: homepageDialog
393
243
        Dialog {
394
244
            id: dialogue
395
245
            title: i18n.tr("Homepage")
396
246
397
247
            Component.onCompleted: {
398
248
                homepageTextField.forceActiveFocus();
399
249
                homepageTextField.cursorPosition = homepageTextField.text.length
400
250
            }
401
251
402
252
            TextField {
403
253
                id: homepageTextField
404
254
                text: settingsObject.homepage
405
255
                inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText | Qt.ImhUrlCharactersOnly
406
256
            }
407
257
408
258
            Button {
409
259
                anchors { left: parent.left; right: parent.right }
410
260
                text: i18n.tr("Cancel")
411
261
                onClicked: PopupUtils.close(dialogue);
412
262
            }
413
263
414
264
            Button {
415
265
                anchors { left: parent.left; right: parent.right }
416
266
                text: i18n.tr("Save")
417
267
                enabled: UrlManagement.looksLikeAUrl(homepageTextField.text)
418
268
                color: "#3fb24f"
419
269
                onClicked: {
420
270
                    settingsObject.homepage = UrlManagement.fixUrl(homepageTextField.text);
421
271
                    PopupUtils.close(dialogue);
422
272
                }
423
273
            }
424
274
        }
425
275
    }
426
276
}
427
277
428
0
278
429
=== added file 'src/app/webbrowser/SettingsPageHeader.qml'
430
--- src/app/webbrowser/SettingsPageHeader.qml	1970-01-01 00:00:00 +0000
431
+++ src/app/webbrowser/SettingsPageHeader.qml	2015-04-07 17:11:13 +0000
432
@@ -0,0 +1,94 @@
433
1
 /*
434
2
 * Copyright 2015 Canonical Ltd.
435
3
 *
436
4
 * This file is part of webbrowser-app.
437
5
 *
438
6
 * webbrowser-app is free software; you can redistribute it and/or modify
439
7
 * it under the terms of the GNU General Public License as published by
440
8
 * the Free Software Foundation; version 3.
441
9
 *
442
10
 * webbrowser-app is distributed in the hope that it will be useful,
443
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
444
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
445
13
 * GNU General Public License for more details.
446
14
 *
447
15
 * You should have received a copy of the GNU General Public License
448
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
449
17
 */
450
18
import QtQuick 2.0
451
19
import Ubuntu.Components 1.1
452
20
import Ubuntu.Components.ListItems 1.0 as ListItem
453
21
454
22
/*
455
23
 * Component to use as page header in settings page and subpages
456
24
 *
457
25
 * It has a back() signal fired when back button is pressed and a text
458
26
 * property to set the page title
459
27
 */
460
28
461
29
Column {
462
30
    id: root
463
31
    signal back()
464
32
    property string text
465
33
466
34
    height: childrenRect.height
467
35
468
36
    anchors {
469
37
        left: parent.left
470
38
        right: parent.right
471
39
    }
472
40
473
41
    Rectangle {
474
42
        id: title
475
43
476
44
        height: units.gu(7) - divider.height
477
45
        anchors { left: parent.left; right: parent.right }
478
46
479
47
        Rectangle {
480
48
            anchors.fill: parent
481
49
            color: "#f6f6f6"
482
50
        }
483
51
484
52
        AbstractButton {
485
53
            id: backButton
486
54
            width: height
487
55
488
56
            onTriggered: root.back()
489
57
            anchors {
490
58
                top: parent.top
491
59
                bottom: parent.bottom
492
60
                left: parent.left
493
61
            }
494
62
495
63
            Rectangle {
496
64
                anchors.fill: parent
497
65
                anchors.leftMargin: units.gu(1)
498
66
                anchors.rightMargin: units.gu(1)
499
67
                color: "#E6E6E6"
500
68
                visible: parent.pressed
501
69
            }
502
70
503
71
            Icon {
504
72
                name: "back"
505
73
                anchors {
506
74
                    fill: parent
507
75
                    topMargin: units.gu(2)
508
76
                    bottomMargin: units.gu(2)
509
77
                }
510
78
            }
511
79
        }
512
80
513
81
        Label {
514
82
            anchors {
515
83
                left: backButton.right
516
84
                verticalCenter: parent.verticalCenter
517
85
            }
518
86
            text: root.text
519
87
            fontSize: 'x-large'
520
88
        }
521
89
    }
522
90
523
91
    ListItem.Divider {
524
92
        id: divider
525
93
    }
526
94
}
527
0
95
528
=== modified file 'src/app/webbrowser/history-model.cpp'
529
--- src/app/webbrowser/history-model.cpp	2014-08-05 17:39:44 +0000
530
+++ src/app/webbrowser/history-model.cpp	2015-04-07 17:11:13 +0000
531
@@ -222,6 +222,7 @@
532
222
        m_entries.prepend(entry);
222
        m_entries.prepend(entry);
533
223
        endInsertRows();
223
        endInsertRows();
534
224
        insertNewEntryInDatabase(entry);
224
        insertNewEntryInDatabase(entry);
535
225
        Q_EMIT rowCountChanged();
536
225
    } else {
226
    } else {
537
226
        QVector<int> roles;
227
        QVector<int> roles;
538
227
        roles << Visits;
228
        roles << Visits;
539
@@ -281,6 +282,7 @@
540
281
282
541
282
    removeByIndex(getEntryIndex(url));
283
    removeByIndex(getEntryIndex(url));
542
283
    removeEntryFromDatabaseByUrl(url);
284
    removeEntryFromDatabaseByUrl(url);
543
285
    Q_EMIT rowCountChanged();
544
284
}
286
}
545
285
287
546
286
/*!
288
/*!
547
@@ -298,6 +300,7 @@
548
298
        }
300
        }
549
299
    }
301
    }
550
300
    removeEntriesFromDatabaseByDomain(domain);
302
    removeEntriesFromDatabaseByDomain(domain);
551
303
    Q_EMIT rowCountChanged();
552
301
}
304
}
553
302
305
554
303
void HistoryModel::removeByIndex(int index)
306
void HistoryModel::removeByIndex(int index)
555
@@ -363,6 +366,7 @@
556
363
        m_entries.clear();
366
        m_entries.clear();
557
364
        endResetModel();
367
        endResetModel();
558
365
        clearDatabase();
368
        clearDatabase();
559
369
        Q_EMIT rowCountChanged();
560
366
    }
370
    }
561
367
}
371
}
562
368
372
563
369
373
564
=== modified file 'src/app/webbrowser/history-model.h'
565
--- src/app/webbrowser/history-model.h	2014-08-05 17:39:44 +0000
566
+++ src/app/webbrowser/history-model.h	2015-04-07 17:11:13 +0000
567
@@ -32,6 +32,7 @@
568
32
    Q_OBJECT
32
    Q_OBJECT
569
33
33
570
34
    Q_PROPERTY(QString databasePath READ databasePath WRITE setDatabasePath NOTIFY databasePathChanged)
34
    Q_PROPERTY(QString databasePath READ databasePath WRITE setDatabasePath NOTIFY databasePathChanged)
571
35
    Q_PROPERTY(int count READ rowCount NOTIFY rowCountChanged)
572
35
36
573
36
    Q_ENUMS(Roles)
37
    Q_ENUMS(Roles)
574
37
38
575
@@ -64,6 +65,7 @@
576
64
65
577
65
Q_SIGNALS:
66
Q_SIGNALS:
578
66
    void databasePathChanged() const;
67
    void databasePathChanged() const;
579
68
    void rowCountChanged();
580
67
69
581
68
private:
70
private:
582
69
    QSqlDatabase m_database;
71
    QSqlDatabase m_database;
583
70
72
584
=== added file 'src/app/webbrowser/urlManagement.js'
585
--- src/app/webbrowser/urlManagement.js	1970-01-01 00:00:00 +0000
586
+++ src/app/webbrowser/urlManagement.js	2015-04-07 17:11:13 +0000
587
@@ -0,0 +1,50 @@
588
1
/*
589
2
 * Copyright 2015 Canonical Ltd.
590
3
 *
591
4
 * This file is part of webbrowser-app.
592
5
 *
593
6
 * webbrowser-app is free software; you can redistribute it and/or modify
594
7
 * it under the terms of the GNU General Public License as published by
595
8
 * the Free Software Foundation; version 3.
596
9
 *
597
10
 * webbrowser-app is distributed in the hope that it will be useful,
598
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
599
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
600
13
 * GNU General Public License for more details.
601
14
 *
602
15
 * You should have received a copy of the GNU General Public License
603
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
604
17
*/
605
18
'use strict';
606
19
607
20
function fixUrl(address) {
608
21
    var url = address
609
22
    if (address.substr(0, 1) == "/") {
610
23
        url = "file://" + address
611
24
    } else if (address.indexOf("://") == -1) {
612
25
        url = "http://" + address
613
26
    }
614
27
    return url
615
28
}
616
29
617
30
function looksLikeAUrl(address) {
618
31
    var terms = address.split(/\s/)
619
32
    if (terms.length > 1) {
620
33
        return false
621
34
    }
622
35
    if (address.substr(0, 1) == "/") {
623
36
        return true
624
37
    }
625
38
    if (address.match(/^https?:\/\//i) ||
626
39
        address.match(/^file:\/\//i) ||
627
40
        address.match(/^[a-z]+:\/\//i)) {
628
41
        return true
629
42
    }
630
43
    if (address.split('/', 1)[0].match(/\.[a-zA-Z]{2,4}$/)) {
631
44
        return true
632
45
    }
633
46
    if (address.split('/', 1)[0].match(/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}/)) {
634
47
        return true
635
48
    }
636
49
    return false
637
50
}
638
0
51
639
=== modified file 'tests/unittests/history-model/tst_HistoryModelTests.cpp'
640
--- tests/unittests/history-model/tst_HistoryModelTests.cpp	2014-08-05 17:39:44 +0000
641
+++ tests/unittests/history-model/tst_HistoryModelTests.cpp	2015-04-07 17:11:13 +0000
642
@@ -243,6 +243,21 @@
643
243
        QCOMPARE(model->rowCount(), 0);
243
        QCOMPARE(model->rowCount(), 0);
644
244
    }
244
    }
645
245
245
646
246
    void shouldCountNumberOfEntries()
647
247
    {
648
248
        QSignalSpy spyCount(model, SIGNAL(rowCountChanged()));
649
249
        QCOMPARE(model->property("count").toInt(), 0);
650
250
        model->add(QUrl("http://example.org/"), "Example Domain", QUrl());
651
251
        QCOMPARE(model->property("count").toInt(), 1);
652
252
        QCOMPARE(spyCount.count(), 1);
653
253
        model->add(QUrl("http://example.com/"), "Example Domain", QUrl());
654
254
        QCOMPARE(model->property("count").toInt(), 2);
655
255
        QCOMPARE(spyCount.count(), 2);
656
256
        model->clearAll();
657
257
        QCOMPARE(model->property("count").toInt(), 0);
658
258
        QCOMPARE(spyCount.count(), 3);
659
259
    }
660
260
661
246
};
261
};
662
247
262
663
248
QTEST_MAIN(HistoryModelTests)
263
QTEST_MAIN(HistoryModelTests)
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-04-07
Olivier Tilloy		2015-03-24	Approve on 2015-04-07
Bill Filler (community)			Approve on 2015-04-07
Review via email: mp+253975@code.launchpad.net