Skip to content

Commit f0f3b6c

Browse files
authored
Merge pull request #82 from lyonx/cache
Cache
2 parents 4ec2bba + c067aa6 commit f0f3b6c

35 files changed

Lines changed: 8860 additions & 615 deletions

.DS_Store

-6 KB
Binary file not shown.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ test/assets/bower_components
3131
#coverage folder
3232
test/coverage
3333

34+
**.DS_Store
35+

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"ng-file-upload": "~6.1.0",
1212
"ng-file-upload-shim": "~6.1.0",
1313
"tinymce": "~4.2.3",
14-
"owlcarousel": "~1.3.2",
15-
"angular-bootstrap": "~0.13.3"
14+
"angular-bootstrap": "~0.13.3",
15+
"owl.carousel": "~2.3.4"
1616
},
1717
"ignore": [
1818
"**/.*",

control/content/app.services.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
.provider('Buildfire', [function () {
1414
var Buildfire = this;
1515
Buildfire.$get = function () {
16-
return buildfire
16+
return buildfire;
1717
};
1818
return Buildfire;
1919
}])
@@ -53,7 +53,7 @@
5353
Buildfire.datastore.save(_item, _tagName, callback);
5454
return deferred.promise;
5555
}
56-
}
56+
};
5757
}])
5858

5959
/**
@@ -81,6 +81,6 @@
8181
};
8282
return {
8383
validateFeedUrl: validateFeedUrl
84-
}
84+
};
8585
}]);
8686
})(window.angular, window.buildfire);

control/content/controllers/content.home.controller.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@
179179
}
180180
//updateMasterItem(ContentHome.data);
181181
if (tmrDelay) {
182-
clearTimeout(tmrDelay)
182+
clearTimeout(tmrDelay);
183183
}
184184
}
185185
, error = function (err) {
186186
console.error('Error while getting data', err);
187187
if (tmrDelay) {
188-
clearTimeout(tmrDelay)
188+
clearTimeout(tmrDelay);
189189
}
190190

191191
};
@@ -290,6 +290,7 @@
290290
ContentHome.isValidUrl = true;
291291
ContentHome.isValidateButtonClicked = false;
292292
ContentHome.data.content.rssUrl = ContentHome.rssFeedUrl;
293+
searchEngine.indexFeed(ContentHome.data.content.rssUrl);
293294
Buildfire.spinner.hide();
294295
$timeout(function () {
295296
ContentHome.isValidUrl = false;
@@ -298,25 +299,25 @@
298299
, error = function (err) {
299300
switch (err.code) {
300301
case 'ETIMEDOUT': {
301-
ContentHome.errorMessage = "No response from the RSS server."
302+
ContentHome.errorMessage = "No response from the RSS server.";
302303
break;
303304
}
304305
case 'ENOTFOUND': {
305-
ContentHome.errorMessage = "Can't find the requested resource. Check the URL."
306+
ContentHome.errorMessage = "Can't find the requested resource. Check the URL.";
306307
break;
307308
}
308309
case 500: {
309-
ContentHome.errorMessage = "Something went wrong in the RSS server."
310+
ContentHome.errorMessage = "Something went wrong in the RSS server.";
310311
break;
311312
}
312313
case 200: {
313314
if (err.message === "Invalid RSS feeds format") {
314-
ContentHome.errorMessage = "Feed format is invalid."
315+
ContentHome.errorMessage = "Feed format is invalid.";
315316
}
316317
break;
317318
}
318319
default: {
319-
ContentHome.errorMessage = "Not a valid feed URL. Try again."
320+
ContentHome.errorMessage = "Not a valid feed URL. Try again.";
320321
break;
321322
}
322323
}

control/content/index.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
<!-- CSS -->
55
<link href="../../../../styles/helper.css" rel="stylesheet">
66
<link href="../../../../styles/siteIcons.css" rel="stylesheet">
7+
8+
<!-- build:bundleCSSFiles -->
79
<link href="assets/css/content.app.css" rel="stylesheet">
10+
<!-- endbuild -->
811

912
<!-- JS -->
1013
<script src="../../../../scripts/jquery/jquery-1.11.2.min.js"></script>
@@ -18,10 +21,16 @@
1821
<script src="../../../../scripts/angular/ui-bootstrap.min.js"></script>
1922
<script src="../../../../scripts/tinymce/tinymce.min.js"></script>
2023
<script src="../../../../scripts/tinymce/ui-tinymce.js"></script>
24+
<script src="../../../../scripts/buildfire/services/searchEngine/searchEngine.js"></script>
25+
26+
<!-- build:bundleJSFiles -->
2127
<script src="app.js"></script>
2228
<script src="enums.js"></script>
2329
<script src="app.services.js"></script>
2430
<script src="controllers/content.home.controller.js"></script>
31+
<script src="searchEngine.js"></script>
32+
<!-- endbuild -->
33+
2534
<link rel="stylesheet" href="../../../../styles/transitionAnimation.css">
2635
<meta charset="UTF-8">
2736
</head>

control/design/app.services.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
.provider('Buildfire', [function () {
1414
var Buildfire = this;
1515
Buildfire.$get = function () {
16-
return buildfire
16+
return buildfire;
1717
};
1818
return Buildfire;
1919
}])
@@ -53,7 +53,7 @@
5353
Buildfire.datastore.save(_item, _tagName, callback);
5454
return deferred.promise;
5555
}
56-
}
56+
};
5757
}])
5858

5959
/**
@@ -80,6 +80,6 @@
8080
Buildfire.imageLib.showDialog(_options, callback);
8181
return deferred.promise;
8282
}
83-
}
83+
};
8484
}]);
8585
})(window.angular, window.buildfire);

control/design/enums.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@
5353
.constant('FEED_IMAGES', {
5454
YES: 'Yes',
5555
NO: 'No'
56-
})
56+
});
5757
})(window.angular);

control/design/index.html

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
<html ng-app="mediaCenterRSSPluginDesign">
33
<head lang="en">
44
<!-- CSS -->
5+
6+
<!-- build:bundleCSSFiles -->
7+
<link href="assets/css/design.app.css" rel="stylesheet">
8+
<!-- endbuild -->
9+
510
<link href="../../../../styles/helper.css" rel="stylesheet">
611
<link href="../../../../styles/siteIcons.css" rel="stylesheet">
7-
<link href="assets/css/design.app.css" rel="stylesheet">
812

913
<!-- JS -->
1014
<script src="../../../../scripts/buildfire.min.js"></script>
@@ -13,12 +17,15 @@
1317
<script src="../../../../scripts/angular/ui-bootstrap.min.js"></script>
1418
<script src="../../../../scripts/tinymce/tinymce.min.js"></script>
1519
<script src="../../../../scripts/tinymce/ui-tinymce.js"></script>
20+
21+
<!-- build:bundleJSFiles -->
1622
<script src="app.js"></script>
1723
<script src="enums.js"></script>
1824
<script src="filters.js"></script>
1925
<script src="app.services.js"></script>
2026
<script src="controllers/design.home.controller.js"></script>
21-
27+
<!-- endbuild -->
28+
2229
<meta charset="UTF-8">
2330
</head>
2431
<body>

0 commit comments

Comments
 (0)