Date: Friday, January 13, 2017 @ 08:13:13 Author: felixonmars Revision: 207164
upgpkg: deepin-manual 1.0.6-1 Modified: deepin-manual/trunk/PKGBUILD Deleted: deepin-manual/trunk/angular.patch ---------------+ PKGBUILD | 10 +++------- angular.patch | 45 --------------------------------------------- 2 files changed, 3 insertions(+), 52 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-01-13 08:12:34 UTC (rev 207163) +++ PKGBUILD 2017-01-13 08:13:13 UTC (rev 207164) @@ -4,7 +4,7 @@ # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> pkgname=deepin-manual -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc='Deepin User Manual' arch=('any') @@ -13,10 +13,8 @@ depends=('python-jieba' 'python-pyqt5' 'python-gobject' 'deepin-qml-widgets' 'python-dae') makedepends=('npm' 'sassc' 'git') groups=('deepin') -source=("git+https://github.com/linuxdeepin/deepin-manual.git#tag=$pkgver" - angular.patch) -sha256sums=('SKIP' - 'a29d8927add3f99f8c1cc4aed238c8b6d8a93e2e35560ec555bb2569a81de1f6') +source=("git+https://github.com/linuxdeepin/deepin-manual.git#tag=$pkgver") +sha256sums=('SKIP') prepare() { cd deepin-manual @@ -25,8 +23,6 @@ -e 's/sass /sassc /' \ -e 's/--unix-newlines//' \ -i Makefile - - patch -p1 -i ../angular.patch } build() { Deleted: angular.patch =================================================================== --- angular.patch 2017-01-13 08:12:34 UTC (rev 207163) +++ angular.patch 2017-01-13 08:13:13 UTC (rev 207164) @@ -1,45 +0,0 @@ -commit 3ae465ea1274ddef845683bc7d9a0425f8171f88 -Author: Felix Yan <felixonm...@archlinux.org> -Date: Mon Dec 12 15:25:03 2016 +0800 - - Adapt to new angular $http syntax - - Change-Id: I6ae4cbd2a1532d32c2aa22e842a3ee73d9ac424a - -diff --git a/PageRoot/www/jssrc/services/InputService.js b/PageRoot/www/jssrc/services/InputService.js -index 98cf677..a344a4c 100644 ---- a/PageRoot/www/jssrc/services/InputService.js -+++ b/PageRoot/www/jssrc/services/InputService.js -@@ -10,21 +10,21 @@ angular.module("General") - switch (parsed.protocol) { - case "http:": - case "https:": { -- return $http.get(url) -- .success(function(data) { -- resolve(data); -- }) -- .error(function(_, status) { -- reject(`Failed to load with status ${status}`); -+ return $http.get(url).then( -+ function(response) { -+ resolve(response.data); -+ }, -+ function(response) { -+ reject(`Failed to load with status ${response.status}`); - }); - } - case "file:": { - if (typeof XMLHttpRequest !== "undefined") { -- return $http.get(url) -- .success(function(data) { -- resolve(data); -- }) -- .error(function() { -+ return $http.get(url).then( -+ function(response) { -+ resolve(response.data); -+ }, -+ function(response) { - reject("Failed to load local file."); - }); - } else {