Merge branch 'develop'

tubepress · Mar 23, 2016 · c011cec · c011cec
2 parents 4efe774 + 5cd3f9a
commit c011cec
Show file tree

Hide file tree

Showing 44 changed files with 1,692 additions and 294 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 .DS_Store
 /bin
-/build/src/npm/node_modules/
+node_modules/
 /build/target/
 /.idea*
 /vendor
-/tubepress.php
+/tubepress.php
diff --git a/build/build.xml b/build/build.xml
@@ -23,7 +23,7 @@
 
     <target name="stage" depends="clean">
         <create-build-directories />
-        <initialize-properties />
+        <initialize-properties file="config/version.properties" />
         <stage-base-src />
         <stage-wordpress />
         <suppress-directory-listings />

diff --git a/build/config/boot-classes.php b/build/config/boot-classes.php
@@ -48,8 +48,6 @@
     'tubepress_api_util_StringUtilsInterface',
     'tubepress_api_version_Version',
     'tubepress_environment_impl_Environment',
-    'tubepress_event_impl_tickertape_EventBase',
-    'tubepress_event_impl_tickertape_EventDispatcher',
     'tubepress_html_impl_CssAndJsGenerationHelper',
     'tubepress_html_impl_HtmlGenerator',
     'tubepress_html_impl_listeners_HtmlListener',
@@ -67,15 +65,6 @@
     'tubepress_options_impl_DispatchingReference',
     'tubepress_options_impl_Persistence',
     'tubepress_shortcode_impl_Parser',
-    'tubepress_template_impl_DelegatingEngine',
-    'tubepress_template_impl_php_PhpEngine',
-    'tubepress_template_impl_php_Support',
-    'tubepress_template_impl_TemplatingService',
-    'tubepress_template_impl_ThemeTemplateLocator',
-    'tubepress_template_impl_twig_Engine',
-    'tubepress_template_impl_twig_EnvironmentBuilder',
-    'tubepress_template_impl_twig_FsLoader',
-    'tubepress_template_impl_twig_ThemeLoader',
     'tubepress_theme_impl_CurrentThemeService',
     'tubepress_url_impl_puzzle_PuzzleBasedQuery',
     'tubepress_url_impl_puzzle_PuzzleBasedUrl',

diff --git a/build/config/src-exclusions.txt b/build/config/src-exclusions.txt
@@ -57,4 +57,6 @@ phpunit.xml.dist
 /vendor/twig/twig/ext
 /vendor/twig/twig/lib/Twig/Test
 /vendor/twig/twig/README.rst
-/vendor/twig/twig/test
+/vendor/twig/twig/test
+/package.json
+/node_modules
diff --git a/build/config/version.properties b/build/config/version.properties
@@ -1,3 +1,3 @@
 tubepress.version.major=5
-tubepress.version.minor=0
-tubepress.version.micro=2
+tubepress.version.minor=1
+tubepress.version.micro=0
diff --git a/build/config/webpack.config.js b/build/config/webpack.config.js
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2006 - 2016 TubePress LLC (http://tubepress.com)
+ *
+ * This file is part of TubePress (http://tubepress.com)
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+module.exports = {
+
+    context : __dirname + '/../../src/js',
+
+    entry: "./entry.js",
+
+    output: {
+
+        filename: "bundle.js"
+    },
+
+    module: {
+
+        loaders: [
+            { test: /\.css$/, loader: "style!css" }
+        ]
+    },
+
+    resolveLoader: {
+
+        fallback: __dirname + "/../src/npm/node_modules"
+    }
+};
diff --git a/build/src/ant/macros/common/03-initialize-properties.xml b/build/src/ant/macros/common/03-initialize-properties.xml
@@ -14,9 +14,10 @@
 <project>
 
     <macrodef name="initialize-properties">
+        <attribute name="file" />
         <sequential>
-            <log msg="Initializing properties" />
-            <property file="config/version.properties" />
+            <log msg="Initializing properties from @{file}" />
+            <property file="@{file}" />
         </sequential>
     </macrodef>
 

diff --git a/build/src/ant/macros/package/01-compress-js-css.xml b/build/src/ant/macros/package/01-compress-js-css.xml
@@ -17,7 +17,7 @@
         <sequential>
             <__npm-install />
             <__save-dev-copies list-of-files="config/css-to-compress.txt" extension=".css" />
-            <apply executable="../../../src/npm/node_modules/.bin/uglifycss" parallel="false" dir="target/stage/tubepress" relative="true"
+            <apply executable="../../../../node_modules/.bin/uglifycss" parallel="false" dir="target/stage/tubepress" relative="true"
                    failonerror="true">
                 <fileset dir="target/stage/tubepress/" includesfile="config/css-to-compress.txt"/>
                 <redirector>
@@ -33,12 +33,13 @@
         <sequential>
             <__npm-install />
             <__save-dev-copies list-of-files="config/js-to-compress.txt" extension=".js" />
-            <apply executable="../../../src/npm/node_modules/.bin/uglifyjs" parallel="false" dir="target/stage/tubepress" relative="true"
+            <apply executable="../../../../node_modules/.bin/uglifyjs" parallel="false" dir="target/stage/tubepress" relative="true"
                    failonerror="true">
                 <fileset dir="target/stage/tubepress/" includesfile="config/js-to-compress.txt"/>
                 <srcfile />
                 <arg value="--mangle" />
                 <arg value="--compress" />
+                <arg value="--comments" />
                 <arg value="sequences,unsafe,conditionals,comparisons,booleans,loops,if_return,join_vars,cascade" />
                 <redirector>
                     <outputmapper>
@@ -52,7 +53,7 @@
     <macrodef name="__npm-install">
         <sequential>
             <log msg="Installing npm modules" />
-            <exec executable="npm" failonerror="true" dir="src/npm">
+            <exec executable="npm" failonerror="true" dir="../">
                 <arg value="install" />
                 <arg value="--silent" />
             </exec>

diff --git a/build/src/npm/package.json → package.json b/build/src/npm/package.json → package.json
@@ -1,6 +1,6 @@
 {
-  "name" : "tubepress-build",
-  "version" : "0.0.1",
+  "name" : "tubepress-core",
+  "version" : "1.0.0",
   "author" : "TubePress LLC",
   "license" : "MPL-2.0",
   "contributors" : [
@@ -10,8 +10,10 @@
     }
   ],
   "dependencies" : {
-    "uglify-js" : "*",
-    "uglifycss" : "*",
-    "webpack"   : "*"
+    "css-loader"   : "*",
+    "style-loader" : "*",
+    "uglify-js"    : "*",
+    "uglifycss"    : "*",
+    "webpack"      : "*"
   }
 }
diff --git a/src/add-ons/gallery/web/js/gallery.js b/src/add-ons/gallery/web/js/gallery.js
@@ -1,4 +1,6 @@
-/*!
+/**
+ * @license
+ *
  * Copyright 2006 - 2016 TubePress LLC (http://tubepress.com).
  * This file is part of TubePress (http://tubepress.com).
  * This Source Code Form is subject to the terms of the Mozilla Public

diff --git a/src/add-ons/html/web/js/tubepress.js b/src/add-ons/html/web/js/tubepress.js
@@ -1,4 +1,6 @@
-/*!
+/**
+ * @license
+ *
  * Copyright 2006 - 2016 TubePress LLC (http://tubepress.com).
  * This file is part of TubePress (http://tubepress.com).
  * This Source Code Form is subject to the terms of the Mozilla Public

diff --git a/src/add-ons/options-ui/classes/tubepress/options/ui/impl/FieldBuilder.php b/src/add-ons/options-ui/classes/tubepress/options/ui/impl/FieldBuilder.php
@@ -178,6 +178,9 @@ public function newInstance($id, $type, array $options = array())
             case 'oauth2TokenSelection':
                 return $this->_buildOauth2TokenSelection($options);
 
+            case 'textarea':
+                return $this->_buildTextArea($id);
+
             default:
                 throw new InvalidArgumentException('Unknown field type: ' . $type);
         }
@@ -320,6 +323,19 @@ private function _buildMultiSourceText($id, $options)
         return $toReturn;
     }
 
+    private function _buildTextArea($id)
+    {
+        return new tubepress_options_ui_impl_fields_templated_single_SingleOptionField(
+
+            $id,
+            'options-ui/fields/textarea',
+            $this->_persistence,
+            $this->_requestParams,
+            $this->_templating,
+            $this->_optionReference
+        );
+    }
+
     private function _buildMultiSourceTextArea($id)
     {
         return new tubepress_options_ui_impl_fields_templated_single_MultiSourceSingleOptionField(

diff --git a/src/add-ons/player/templates/gallery/players/static/static.html.twig b/src/add-ons/player/templates/gallery/players/static/static.html.twig
@@ -12,7 +12,7 @@
  #
  # An outer wrapper for the title and embed.
  #}
-<div class="tubepress-static-player" style="width: {{ embeddedWidthPx }}px">
+<div class="tubepress-static-player" style="width: {% if responsiveEmbeds %}100%{% else %}{{ embeddedWidthPx }}px{% endif %}">
 
     {% block staticPlayerTitle %}
 

diff --git a/src/add-ons/player/web/js/players/jqmodal-player.js b/src/add-ons/player/web/js/players/jqmodal-player.js
@@ -1,4 +1,6 @@
-/*!
+/**
+ * @license
+ *
  * Copyright 2006 - 2016 TubePress LLC (http://tubepress.com)
  *
  * This file is part of TubePress (http://tubepress.com)

diff --git a/src/add-ons/player/web/js/players/normal-player.js b/src/add-ons/player/web/js/players/normal-player.js
@@ -1,4 +1,6 @@
-/*!
+/**
+ * @license
+ *
  * Copyright 2006 - 2016 TubePress LLC (http://tubepress.com)
  *
  * This file is part of TubePress (http://tubepress.com)

diff --git a/src/add-ons/player/web/js/players/popup-player.js b/src/add-ons/player/web/js/players/popup-player.js
@@ -1,4 +1,6 @@
-/*!
+/**
+ * @license
+ *
  * Copyright 2006 - 2016 TubePress LLC (http://tubepress.com)
  *
  * This file is part of TubePress (http://tubepress.com)

diff --git a/src/add-ons/player/web/js/players/shadowbox-player.js b/src/add-ons/player/web/js/players/shadowbox-player.js
@@ -1,4 +1,6 @@
-/*!
+/**
+ * @license
+ *
  * Copyright 2006 - 2016 TubePress LLC (http://tubepress.com)
  *
  * This file is part of TubePress (http://tubepress.com)

diff --git a/src/add-ons/player/web/vendor/jqmodal/jqModal.css b/src/add-ons/player/web/vendor/jqmodal/jqModal.css
@@ -1,4 +1,4 @@
-/*! jqModal base Styling courtesy of;
+/** @license jqModal base Styling courtesy of;
 	Brice Burgess <bhb@iceburg.net> */
 
 /* The Window's CSS z-index value is respected (takes priority). If none is supplied,

diff --git a/src/add-ons/player/web/vendor/jqmodal/jqModal.js b/src/add-ons/player/web/vendor/jqmodal/jqModal.js
@@ -1,4 +1,6 @@
-/*!
+/**
+ * @license
+ *
  * jqModal - Minimalist Modaling with jQuery
  *
  * Copyright (c) 2007-2014 Brice Burgess @iceburg_net

diff --git a/src/add-ons/wordpress/classes/tubepress/wordpress/api/Constants.php b/src/add-ons/wordpress/classes/tubepress/wordpress/api/Constants.php
@@ -57,6 +57,24 @@ class tubepress_wordpress_api_Constants
      */
     const SHORTCODE_PARSED = 'tubepress.app.shortcode.parsed';
 
+    const OPTION_AUTOPOST_ENABLE           = 'wpAutoPostEnable';
+    const OPTION_AUTOPOST_AUTHOR           = 'wpAutoPostAuthor';
+    const OPTION_AUTOPOST_DATE_SOURCE      = 'wpAutoPostDateSource';
+    const OPTION_AUTOPOST_TITLE_FORMAT     = 'wpAutoPostTitleTemplate';
+    const OPTION_AUTOPOST_CONTENT_TEMPLATE = 'wpAutoPostContentTemplate';
+    const OPTION_AUTOPOST_POST_STATUS      = 'wpAutoPostStatus';
+    const OPTION_AUTOPOST_TYPE             = 'wpAutoPostType';
+    const OPTION_AUTOPOST_ALLOW_COMMENTS   = 'wpAutoPostAllowComments';
+    const OPTION_AUTOPOST_ALLOW_PING       = 'wpAutoPostAllowPings';
+    const OPTION_AUTOPOST_PASSWORD         = 'wpAutoPostPassword';
+    const OPTION_AUTOPOST_TAGS             = 'wpAutoPostTags';
+    const OPTION_AUTOPOST_CATEGORIES       = 'wpAutoPostCategories';
+    const OPTION_AUTOPOST_PAGE_TEMPLATE    = 'wpAutoPostPageTemplate';
+    const OPTION_AUTOPOST_META_MAP         = 'wpAutoPostMetaTemplate';
+
+    const AUTOPOST_DATA_SOURCE_UPLOAD    = 'upload';
+    const AUTOPOST_DATA_SOURCE_DISCOVERY = 'discovery';
+
     /**
      * @deprecated
      */