Merge pull request #11 from ibelar/feature/jsurl

Feature/jsurl

src/AtkWpApp.php

@@ -162,35 +162,67 @@ public function terminate($output = null)
      * @param array $page
      * @param bool  $hasRequestUri
      * @param array $extraArgs
+     * @param bool  $needAjax
      *
      * @return array|null|string
      */
-    public function url($page = [], $hasRequestUri = false, $extraArgs = [])
+    public function url($page = [], $needRequestUri = false, $extraArgs = [])
     {
-        $result = $extraArgs;
+        if (is_string($page)) {
+            return $page;
+        }
+
+        $wpPage = 'admin';
 
+        if ($wpPageRequest = @$_REQUEST['page']) {
+            $extraArgs['page'] = $wpPageRequest;
+        }
+
+        return $this->buildUrl($wpPage, $page, $extraArgs);
+    }
+
+    /**
+     * Return url.
+     *
+     * @param array $page
+     * @param bool  $hasRequestUri
+     * @param array $extraArgs
+     *
+     * @return array|null|string
+     */
+    public function jsUrl($page = [], $hasRequestUri = false, $extraArgs = [])
+    {
         if (is_string($page)) {
             return $page;
         }
 
-        $this->page = 'admin-ajax';
+        $wpPage = 'admin-ajax';
 
         //if running front end set url for ajax.
         if (!WpUtil::isAdmin()) {
             $this->page = WpUtil::getBaseAdminUrl().'admin-ajax';
         }
-        $sticky = $this->sticky_get_arguments;
-        $sticky['action'] = $this->plugin->getPluginName();
-        $sticky['atkwp'] = $this->plugin->getWpComponentId();
+
+        $extraArgs['action'] = $this->plugin->getPluginName();
+        $extraArgs['atkwp'] = $this->plugin->getWpComponentId();
 
         if ($this->plugin->getComponentCount() > 0) {
-            $sticky['atkwp-count'] = $this->plugin->getComponentCount();
+            $extraArgs['atkwp-count'] = $this->plugin->getComponentCount();
         }
 
         if ($this->plugin->config->getConfig('plugin/use_nounce', false)) {
-            $sticky['_ajax_nonce'] = helpers\WpUtil::createWpNounce($this->plugin->getPluginName());
+            $extraArgs['_ajax_nonce'] = helpers\WpUtil::createWpNounce($this->plugin->getPluginName());
         }
 
+        return $this->buildUrl($wpPage, $page, $extraArgs);
+    }
+
+    private function buildUrl($wpPage, $page, $extras)
+    {
+        $result = $extras;
+        $sticky = $this->sticky_get_arguments;
+        $this->page = $wpPage;
+
         if (!isset($page[0])) {
             $page[0] = $this->page;
 

src/services/EnqueueService.php

@@ -28,7 +28,7 @@ class EnqueueService
      */
     private $ctrl;
 
-    protected $semanticUiVersion = '2.2.12';
+    protected $semanticUiVersion = '2.3';
     protected $semanticCalendarVersion = '0.0.8';
     protected $atkUiVersion = '1.4';
 

templates/paginator.html

@@ -1,6 +1,6 @@
 <{_element}div{/} id="{$_id}" class="{_ui}ui{/} {$class} {_class}{/}" style="{$style}" {$attributes}>
 {rows}
-{Item}<a class="item {$active}" data-page="{$page}">{$page}</a>
+{Item}<a class="item {$active}" href="{$link}" data-page="{$page}">{$page}</a>
 {/}
 {Spacer}
 <div class="disabled item">...</div>