(no commit message)

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index 4ffd82c2462382b8a9ccf59c15a3ee79930199c7..c792dc1b35ef5c623064ec2137a23e58f0b6d95d 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.xml
+++ b/fluidbook/tools/fwstk/nbproject/private/private.xml
@@ -2,4 +2,8 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">\r
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>\r
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>\r
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Main.java</file>\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Link.java</file>\r
+    </open-files>\r
 </project-private>\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index aa5fbf37e58dbc19b3e46954eb86aa1871ba99b1..bbc833ad10de0f20112ba1e02b8868dc8f6e5c6c 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -619,6 +619,14 @@ class wsHTML5Compiler {
                $this->config->clinks = array();
                $this->config->bookmarkGroups = array();
 
+
+               $ignore = $this->book->parametres->ignoreLinksTypes;
+               if (!$ignore) {
+                       $ignore = array();
+               } else {
+                       $ignore = split(',', $ignore);
+               }
+
                $daoDoc = new wsDAODocument($core->con);
                $daoDoc->getLinksAndRulers($this->book_id, $links, $rulers);
 
@@ -627,6 +635,9 @@ class wsHTML5Compiler {
                $cpages = array();
                $css = array();
                foreach ($links as $linkData) {
+                       if (in_array($linkData['type'], $ignore)) {
+                               continue;
+                       }
                        $link = wsHTML5Link::getInstance($this->base62($i), $linkData, $this);
                        if (is_null($link)) {
                                continue;
@@ -1029,7 +1040,7 @@ class wsHTML5Compiler {
                return count($res);
        }
 
-protected function _cssBackground() {
+       protected function _cssBackground() {
                $body = '#background{';
                $body.='background-color:#' . $this->theme->parametres->backgroundColor . ';';
                switch ($this->theme->parametres->repeat) {
@@ -1176,7 +1187,6 @@ protected function _cssBackground() {
 }
 
 class wsHTML5CompilerDev extends wsHTML5Compiler {
-
        
 }