Merge branch 'release/2.0.0-beta12'

wordpress-clients · Sep 18, 2016 · 6243664 · 6243664
2 parents c1ef9b7 + 5ed3c54
commit 6243664
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 35 deletions.
diff --git a/BUILD.md b/BUILD.md
@@ -82,6 +82,12 @@ If your device is connected and in USB mode you will see your application that y
 * iOS Simulator
 * Provisioning profile
 
+### iOS10
+
+Also you will need to Assign Your App to a Team: `Project > General > Signing > Select your team ID in the dropdown`
+
+You will also need to disabled bitcode (see iOS9)
+
 ### iOS9
 
 Also you will need to disabled bitcode: `Project > Build Settings > Build Options > Enable Bitcode = No`

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,14 @@
 * [CONFIG] There is no more dev/prod distinction, WPHC turn debug OFF when building the prod app automatically.
 * [ABOUT] The About feature has been removed. You can use Pages to achieve the same purpose.
 
+<a name="2.0.0-beta12"></a>
+### 2.0.0-beta12 (2016-09-18)
+
+* [BUG] Display category/tag title instead of slug <https://github.com/shprink/wordpress-hybrid-client/issues/59>
+* [BUG] Fix Russian/Chinese author title encoding
+* [BUG] Removing Native transitions
+* iOS 10 ready. See notes on BUILD.md
+
 <a name="2.0.0-beta11"></a>
 ### 2.0.0-beta11 (2016-09-04)
 

diff --git a/dist/templates/index.js b/dist/templates/index.js
@@ -25,6 +25,8 @@ mod.run(($templateCache) => {
     // $templateCache.put('module/menu.html', require('!html!./module/menu.html'));
     // $templateCache.put('module/bookmark.html', require('!html!./module/bookmark.html'));
     // $templateCache.put('module/about.html', require('!html!./module/about.html'));
+    // $templateCache.put('module/authors/author.html', require('!html!./module/author.html'));
+    // $templateCache.put('module/authors/authors.html', require('!html!./module/authors.html'));
 
     // Directives
     // $templateCache.put('directive/author.html', require('!html!./directive/author.html'));

diff --git a/lib/authors/config.js b/lib/authors/config.js
@@ -7,7 +7,7 @@ export default function($stateProvider) {
             class: 'module-authors',
             views: {
                 'content': {
-                    template: require("./authors.html"),
+                    templateProvider: ($templateCache) => $templateCache.get('module/authors/authors.html'),
                     controller: "WPHCAuthorsController as authorsCtrl"
                 }
             }
@@ -16,7 +16,7 @@ export default function($stateProvider) {
             class: 'module-authors-<%=id%>',
             views: {
                 'content@public': {
-                    template: require("./author.html"),
+                    templateProvider: ($templateCache) => $templateCache.get('module/authors/author.html'),
                     controller: "WPHCAuthorController as postsCtrl"
                 }
             }

diff --git a/lib/index.coffee b/lib/index.coffee
@@ -7,7 +7,6 @@ require 'angular-cache'
 require 'angular-moment'
 require 'moment'
 require './font/font.coffee'
-require 'ionic-native-transitions'
 require 'expose?_!lodash'
 require 'wp-api-angularjs'
 require './config.js'
@@ -36,7 +35,6 @@ module.exports = app = angular.module 'wordpress-hybrid-client', [
     'ionic'
     'ngIOS9UIWebViewPatch'
     'wordpress-hybrid-client.config'
-    'ionic-native-transitions'
     'ui.router'
     'wp-api-angularjs'
     'angular-cache'
@@ -86,20 +84,6 @@ app.config ($logProvider, $compileProvider) ->
     $logProvider.debugEnabled if IS_PROD then false else true
     $compileProvider.debugInfoEnabled if IS_PROD then false else true
 
-###
-NATIVE TRANSITIONS CONF
-###
-app.config ($WPHCConfig, $ionicNativeTransitionsProvider) ->
-    defaultOptions = _.get $WPHCConfig, 'cordova.nativeTransitions.defaultOptions'
-    defaultTransition = _.get $WPHCConfig, 'cordova.nativeTransitions.defaultTransition'
-    defaultBackTransition = _.get $WPHCConfig, 'cordova.nativeTransitions.defaultBackTransition'
-    enabled = _.get $WPHCConfig, 'cordova.nativeTransitions.enabled'
-    enabled = if _.isBoolean enabled then enabled else true
-    $ionicNativeTransitionsProvider.setDefaultOptions defaultOptions if defaultOptions
-    $ionicNativeTransitionsProvider.setDefaultTransition defaultTransition if defaultTransition
-    $ionicNativeTransitionsProvider.setDefaultBackTransition defaultBackTransition if defaultBackTransition
-    $ionicNativeTransitionsProvider.enable enabled
-
 ###
 IONIC CONF
 ###

diff --git a/lib/index.html b/lib/index.html
@@ -4,7 +4,7 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
-        <meta http-equiv="Content-Security-Policy" content="default-src * 'self' data:; img-src * 'self' 'unsafe-inline' 'unsafe-eval' data: blob: filesystem:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'">
+        <meta http-equiv="Content-Security-Policy" content="default-src * gap://ready file:; img-src * 'self' 'unsafe-inline' 'unsafe-eval' data: blob: filesystem:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'">
 
         <title>{%=o.htmlWebpackPlugin.options.pkg.title %}</title>
         <script>

diff --git a/lib/taxonomies/posts.controller.js b/lib/taxonomies/posts.controller.js
@@ -2,11 +2,12 @@ import AbstractList from '../abstract/AbstractList.js';
 
 export default class extends AbstractList {
 
-    constructor($WPHCPosts, $WPHCTaxonomiesCustomPosts, $injector, $scope, $filter, $stateParams) {
+    constructor($WPHCPosts, $WPHCTaxonomiesCustomPosts, $injector, $scope, $filter, $stateParams, $wpApiTerms) {
         'ngInject';
 
         super($injector, $scope);
         this.showToolbar = true;
+        this.titleLoaded = false;
         this.setType('taxonomiesPosts');
         if ($stateParams.postType == 'post') {
             this.setService($WPHCPosts);
@@ -17,7 +18,39 @@ export default class extends AbstractList {
         this.term = $stateParams.term;
         this.postType = $stateParams.postType;
         this.$filter = $filter;
-        this.setTitle(this.getTitle($stateParams.term, _.get($stateParams, 'taxonomy.name') || $stateParams.slug));
+        const taxoName = _.get($stateParams, 'taxonomy.name');
+        if (taxoName) {
+            this.titleLoaded = true;
+        }
+        this.setTitle(this.getTitle($stateParams.term, taxoName || $stateParams.slug));
+    }
+
+    onDataLoaded(response) {
+        // all we have is the term slug. We cannot get the term object with the slug unfortunetly
+        // only the ID would work but we do not have it.
+        // To display the translated category/tag name as a title we need to go through
+        // the list of posts and get it from them
+        const { slug } = this.$stateParams;
+        const taxoName = _.get(this.$stateParams, 'taxonomy.name');
+        if (!this.titleLoaded && response.data.length) {
+            const taxonomies = _.get(response, "data[0]['_embedded']['https://api.w.org/term']")
+                || _.get(response, "data[0]['_embedded']['wp:term']");
+            if (!taxonomies) {
+                return;
+            }
+            for (let i = 0, len = taxonomies.length; i < len; i++) {
+                const terms = taxonomies[i];
+                for (let j = 0, len2 = terms.length; j < len2; j++) {
+                    const term = terms[j];
+                    if (term.slug === slug) {
+                        this.setTitle(this.getTitle(this.$stateParams.term, term.name));
+                        this.titleLoaded = true;
+                        break;
+                    }
+                }
+            }
+        }
+        return response;
     }
 
     getQuery() {

diff --git a/lib/templates/index.js b/lib/templates/index.js
@@ -15,6 +15,8 @@ mod.run(($templateCache) => {
     $templateCache.put('module/menu.html', require('!html!./module/menu.html'));
     $templateCache.put('module/bookmark.html', require('!html!./module/bookmark.html'));
     $templateCache.put('module/about.html', require('!html!./module/about.html'));
+    $templateCache.put('module/authors/author.html', require('!html!./module/author.html'));
+    $templateCache.put('module/authors/authors.html', require('!html!./module/authors.html'));
 
     // Directives
     $templateCache.put('directive/author.html', require('!html!./directive/author.html'));

diff --git a/lib/authors/author.html → lib/templates/module/author.html b/lib/authors/author.html → lib/templates/module/author.html
@@ -1,5 +1,5 @@
 <ion-view>
-    <ion-nav-title>{{ postsCtrl.title | translate}}</ion-nav-title>
+    <ion-nav-title ng-bind-html="postsCtrl.title | translate"></ion-nav-title>
     <ion-content class="padding bg-gray-lighter">
         <wphc-empty-list list="postsCtrl.list"></wphc-empty-list>
         <wphc-loader ng-if="!postsCtrl.list" on-load="postsCtrl.init()"></wphc-loader>

diff --git a/lib/authors/authors.html → lib/templates/module/authors.html b/lib/authors/authors.html → lib/templates/module/authors.html
@@ -1,5 +1,5 @@
 <ion-view>
-    <ion-nav-title>{{ authorsCtrl.title | translate}}</ion-nav-title>
+    <ion-nav-title ng-bind-html="authorsCtrl.title | translate"></ion-nav-title>
     <ion-content>
         <wphc-empty-list list="authorsCtrl.list"></wphc-empty-list>
         <wphc-loader ng-if="!authorsCtrl.list" on-load="authorsCtrl.init()"></wphc-loader>

diff --git a/lib/templates/module/bookmark.html b/lib/templates/module/bookmark.html
@@ -1,5 +1,5 @@
 <ion-view>
-    <ion-nav-title>{{'bookmark.title' | translate}}</ion-nav-title>
+    <ion-nav-title ng-bind-html="'bookmark.title' | translate"></ion-nav-title>
     <ion-content class="wphc-bookmark">
         <wphc-empty-list list="bookmarkCtrl.posts" text="bookmark.emptyList" icon="ion-bookmark"></wphc-empty-list>
         <wphc-loader ng-if="!bookmarkCtrl.posts"></wphc-loader>

diff --git a/lib/templates/module/customPosts-item.html b/lib/templates/module/customPosts-item.html
@@ -1,5 +1,5 @@
 <ion-view>
-    <ion-nav-title>{{ customPostCtrl.item.title.rendered | translate}}</ion-nav-title>
+    <ion-nav-title ng-bind-html="customPostCtrl.item.title.rendered | translate"></ion-nav-title>
     <ion-content>
         <wphc-loader ng-if="!customPostCtrl.item" on-load="customPostCtrl.init()"></wphc-loader>
         <ion-refresher pulling-text="{{ 'pullToRefresh' | translate}}" on-refresh="customPostCtrl.refresh()"></ion-refresher>

diff --git a/lib/templates/module/customPosts-list.html b/lib/templates/module/customPosts-list.html
@@ -1,5 +1,5 @@
 <ion-view>
-    <ion-nav-title  ng-bind-html="customPostsCtrl.title | translate"></ion-nav-title>
+    <ion-nav-title ng-bind-html="customPostsCtrl.title | translate"></ion-nav-title>
     <ion-content class="padding bg-gray-lighter">
         <wphc-empty-list list="customPostsCtrl.list"></wphc-empty-list>
         <wphc-loader ng-if="!customPostsCtrl.list" on-load="customPostsCtrl.init()"></wphc-loader>

diff --git a/lib/templates/module/pages-list.html b/lib/templates/module/pages-list.html
@@ -1,5 +1,5 @@
 <ion-view>
-    <ion-nav-title>{{ pagesCtrl.title | translate}}</ion-nav-title>
+    <ion-nav-title ng-bind-html="pagesCtrl.title | translate"></ion-nav-title>
     <ion-content class="padding bg-gray-lighter">
         <wphc-empty-list list="pagesCtrl.list"></wphc-empty-list>
         <wphc-loader ng-if="!pagesCtrl.list" on-load="pagesCtrl.init()"></wphc-loader>

diff --git a/lib/templates/module/posts-list.html b/lib/templates/module/posts-list.html
@@ -1,5 +1,5 @@
 <ion-view>
-    <ion-nav-title>{{ postsCtrl.title | translate}}</ion-nav-title>
+    <ion-nav-title ng-bind-html="postsCtrl.title | translate"></ion-nav-title>
     <ion-content class="padding bg-gray-lighter">
         <wphc-empty-list list="postsCtrl.list"></wphc-empty-list>
         <wphc-loader ng-if="!postsCtrl.list" on-load="postsCtrl.init()"></wphc-loader>

diff --git a/lib/templates/module/taxonomies-list.html b/lib/templates/module/taxonomies-list.html
@@ -1,5 +1,5 @@
 <ion-view>
-    <ion-nav-title>{{ taxonomiesCtrl.title | translate}}</ion-nav-title>
+    <ion-nav-title ng-bind-html="taxonomiesCtrl.title | translate"></ion-nav-title>
     <ion-content>
         <wphc-empty-list list="taxonomiesCtrl.list"></wphc-empty-list>
         <wphc-loader ng-if="!taxonomiesCtrl.list" on-load="taxonomiesCtrl.init()"></wphc-loader>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wordpress-hybrid-client",
-  "version": "2.0.0-beta11",
+  "version": "2.0.0-beta12",
   "title": "wordpress-hybrid-client",
   "description": "AngularJS client using Ionic Framework and based on the json-rest-api plugin: https://wordpress.org/plugins/json-rest-api/ with CORS enabled.",
   "main": "index.js",
@@ -85,7 +85,6 @@
     "highlight.js": "^8.9.0",
     "imagesloaded": "^3.1.8",
     "imgcache.js": "^1.0.0",
-    "ionic-native-transitions": "v1.0.0-rc5",
     "ionic-angular": "~1.3.1",
     "lodash": "^3.9.3",
     "moment": "^2.9.0",
@@ -111,10 +110,6 @@
     "cordova-plugin-x-toast@2.1.1",
     "cordova-plugin-statusbar@1.0.1",
     "cordova-plugin-google-analytics@0.8.1",
-    {
-      "locator": "https://github.com/Telerik-Verified-Plugins/NativePageTransitions#0.5.5",
-      "id": "com.telerik.plugins.nativepagetransitions"
-    },
     "phonegap-plugin-push@1.5.3",
     "cordova-plugin-crosswalk-webview@1.6.0",
     "cordova-plugin-spinner-dialog@1.3.1",