From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 19 Mar 2013 14:07:05 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=af79271cd2bfb1a105774a1e92fd6457c99c8d3f;p=cubeextranet.git

---

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index 4ffd82c24..c792dc1b3 100644
--- 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">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Main.java</file>
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Link.java</file>
+    </open-files>
 </project-private>
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index aa5fbf37e..bbc833ad1 100644
--- 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 {
-
 	
 }