Mhurd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205760
Change subject: Remove run-time css sync so we have more control over css
deployment.
......................................................................
Remove run-time css sync so we have more control over css deployment.
Change-Id: I915ff69adb6a8e45c5ab5935ddf9fabb1a497b50
---
M Wikipedia/AssetsFile/WMFAssetsFile.h
M Wikipedia/AssetsFile/WMFAssetsFile.m
M Wikipedia/View Controllers/WebView/WebViewController.m
3 files changed, 3 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/60/205760/1
diff --git a/Wikipedia/AssetsFile/WMFAssetsFile.h
b/Wikipedia/AssetsFile/WMFAssetsFile.h
index d597a8c..cd970d6 100644
--- a/Wikipedia/AssetsFile/WMFAssetsFile.h
+++ b/Wikipedia/AssetsFile/WMFAssetsFile.h
@@ -5,9 +5,6 @@
WMFAssetsFileTypeConfig,
WMFAssetsFileTypeLanguages,
WMFAssetsFileTypeMainPages,
- WMFAssetsFileTypeCSS,
- WMFAssetsFileTypeCSSAbuseFilter,
- WMFAssetsFileTypeCSSPreview
};
@interface WMFAssetsFile : NSObject
diff --git a/Wikipedia/AssetsFile/WMFAssetsFile.m
b/Wikipedia/AssetsFile/WMFAssetsFile.m
index 36fe30f..e1db5a1 100644
--- a/Wikipedia/AssetsFile/WMFAssetsFile.m
+++ b/Wikipedia/AssetsFile/WMFAssetsFile.m
@@ -77,18 +77,6 @@
return @"mainpages.json";
break;
- case WMFAssetsFileTypeCSS:
- return @"styles.css";
- break;
-
- case WMFAssetsFileTypeCSSAbuseFilter:
- return @"abusefilter.css";
- break;
-
- case WMFAssetsFileTypeCSSPreview:
- return @"preview.css";
- break;
-
default:
return nil;
break;
@@ -101,18 +89,6 @@
switch (self.fileType) {
case WMFAssetsFileTypeConfig:
urlString =
@"https://bits.wikimedia.org/static-current/extensions/MobileApp/config/ios.json";;
- break;
-
- case WMFAssetsFileTypeCSS:
- urlString =
@"https://bits.wikimedia.org/en.wikipedia.org/load.php?debug=false&lang=en&modules=mobile.app.pagestyles.ios&only=styles&skin=vector";;
- break;
-
- case WMFAssetsFileTypeCSSAbuseFilter:
- urlString =
@"https://bits.wikimedia.org/en.wikipedia.org/load.php?debug=false&lang=en&modules=mobile.app.pagestyles.ios&only=styles&skin=vector";;
- break;
-
- case WMFAssetsFileTypeCSSPreview:
- urlString =
@"https://bits.wikimedia.org/en.wikipedia.org/load.php?debug=false&lang=en&modules=mobile.app.preview&only=styles&skin=vector";;
break;
default:
diff --git a/Wikipedia/View Controllers/WebView/WebViewController.m
b/Wikipedia/View Controllers/WebView/WebViewController.m
index a6dc77c..b29d8fb 100644
--- a/Wikipedia/View Controllers/WebView/WebViewController.m
+++ b/Wikipedia/View Controllers/WebView/WebViewController.m
@@ -374,16 +374,9 @@
// Sync config/ios.json at most once per day.
[[QueuesSingleton sharedInstance].assetsFetchManager.operationQueue
cancelAllOperations];
- void (^ fetch)(WMFAssetsFileType) = ^void (WMFAssetsFileType type) {
- (void)[[AssetsFileFetcher alloc] initAndFetchAssetsFileOfType:type
-
withManager:[QueuesSingleton sharedInstance].assetsFetchManager
-
maxAge:kWMFMaxAgeDefault];
- };
-
- fetch(WMFAssetsFileTypeConfig);
- fetch(WMFAssetsFileTypeCSS);
- fetch(WMFAssetsFileTypeCSSAbuseFilter);
- fetch(WMFAssetsFileTypeCSSPreview);
+ (void)[[AssetsFileFetcher alloc]
initAndFetchAssetsFileOfType:WMFAssetsFileTypeConfig
+
withManager:[QueuesSingleton sharedInstance].assetsFetchManager
+
maxAge:kWMFMaxAgeDefault];
}
#pragma mark Edit section
--
To view, visit https://gerrit.wikimedia.org/r/205760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I915ff69adb6a8e45c5ab5935ddf9fabb1a497b50
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
