</artifacts-to-build>
</component>
<component name="ChangeListManager">
- <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="fix #2243 @0:40">
- <change afterPath="$PROJECT_DIR$/.idea/libraries/commons_io_2_6.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/commons_logging_1_2.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/commons_text_1_6.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/fontbox_1_8_16.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/jempbox_1_8_16.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/pdfbox_1_8_16.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/lib/commons-io-2.6.jar" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/lib/commons-lang3-3.8.1.jar" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/lib/commons-logging-1.2.jar" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/lib/commons-text-1.6.jar" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/lib/fontbox-1.8.16.jar" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/lib/jempbox-1.8.16.jar" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/lib/pdfbox-1.8.16.jar" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fontbox-1.8.16.jar" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/jempbox-1.8.16.jar" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/pdfbox-1.8.16.jar" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/avalon_framework_4_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/avalon_framework_4_1_4.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/fontbox_1_8_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/jempbox_1_8_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/pdfbox_1_8_13.xml" beforeDir="false" />
+ <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="fix #2353 @6">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/MANIFEST.MF" beforeDir="false" afterPath="$PROJECT_DIR$/MANIFEST.MF" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/fwstk.iml" beforeDir="false" afterPath="$PROJECT_DIR$/fwstk.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/lib/commons-io-2.4.jar" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/lib/commons-lang3-3.7.jar" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/lib/commons-logging-1.1.1.jar" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/lib/fontbox-1.8.13.jar" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/lib/jempbox-1.8.13.jar" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/lib/pdfbox-1.8.13.jar" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/commons-lang3-3.7.jar" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java" afterDir="false" />
</list>
<ignored path="fwstk.iws" />
<ignored path=".idea/workspace.xml" />
<session id="-183392587">
<usages-collector id="statistics.lifecycle.project">
<counts>
- <entry key="project.closed" value="5" />
+ <entry key="project.closed" value="6" />
<entry key="project.open.time.1" value="1" />
<entry key="project.open.time.10" value="1" />
<entry key="project.open.time.11" value="1" />
<counts>
<entry key="MF" value="17" />
<entry key="java" value="48" />
- <entry key="txt" value="15" />
+ <entry key="txt" value="27" />
<entry key="xml" value="38" />
</counts>
</usages-collector>
<counts>
<entry key="JAVA" value="48" />
<entry key="Manifest" value="17" />
- <entry key="PLAIN_TEXT" value="15" />
+ <entry key="PLAIN_TEXT" value="27" />
<entry key="XML" value="38" />
</counts>
</usages-collector>
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542712260318" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542740619620" />
<property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
<property name="js.eslint.eslintPackage" value="" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/lib/commons-logging-1.2.jar!/" />
<workItem from="1541603515738" duration="1532000" />
<workItem from="1542650839553" duration="56000" />
<workItem from="1542710796466" duration="980000" />
- <workItem from="1542711819188" duration="1040000" />
+ <workItem from="1542711819188" duration="1661000" />
</task>
<task id="LOCAL-00001" summary="wip #1111 @0.5">
<created>1487172253077</created>
<option name="project" value="LOCAL" />
<updated>1536937362634</updated>
</task>
- <option name="localTasksCounter" value="9" />
+ <task id="LOCAL-00009" summary="fix #2353 @6">
+ <created>1542716707708</created>
+ <option name="number" value="00009" />
+ <option name="presentableId" value="LOCAL-00009" />
+ <option name="project" value="LOCAL" />
+ <updated>1542716707709</updated>
+ </task>
+ <option name="localTasksCounter" value="10" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="83340000" />
+ <option name="totallyTimeSpent" value="83961000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
+ <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
+ <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="wip #1111 @0.5" />
<MESSAGE value="wip #811 @12" />
<MESSAGE value="wip #811 @7" />
<MESSAGE value="fix #1629 @3" />
<MESSAGE value="wait #1866 @6" />
<MESSAGE value="fix #2243 @0:40" />
- <option name="LAST_COMMIT_MESSAGE" value="fix #2243 @0:40" />
+ <MESSAGE value="fix #2353 @6" />
+ <option name="LAST_COMMIT_MESSAGE" value="fix #2353 @6" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
$this->fields['title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de la publication"), 'embed' => false);
$this->fields['url_link'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __("URL du lien de retour au site"));
$this->fields['signature'] = array('type' => 'combo', 'default' => '1', 'editable' => true, 'label' => __('Signature'), 'grade' => 3, 'datas' => wsDroits::getSignatures());
+ $this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'flip', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 3,
+ 'datas' => array(__('Aucune transition') => 'none',
+ __('Glisser') => 'slide',
+ __('Tourner (rigide)') => 'flip',
+ __('Tourner (souple, expérimental)') => 'flip3d')
+ );
$this->forms['important'] = array('label' => __('Description de la publication'),
- 'fieldsnames' => array('version', 'mobileLVersion', 'mobileVersion', 'title', 'url_link', 'signature'));
+ 'fieldsnames' => array('version', 'mobileLVersion', 'mobileVersion', 'mobileTransitions', 'title', 'url_link', 'signature'));
// .
// .
$this->fields['menuBreakpoint'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Breakpoint burger menu'), 'hint' => 'Par défaut 1023px', 'grade' => 3);
- $this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'flip', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 3,
- 'datas' => array(__('Aucune transition') => 'none',
- __('Glisser') => 'slide',
- __('Tourner') => 'flip')
- );
$this->fields['mobileNavigationType'] = array('type' => 'combo', 'default' => 'book', 'editable' => true, 'label' => __('Mode de navigation'), 'grade' => 5,
'datas' => array(__('Normal (automatique)') => 'book',
__('Normal (double page)') => 'landscape',
$this->fields['mobileIgnoreBackgroundLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ignorer les liens de background'));
$this->forms['mobile'] = array('label' => __('Version mobile'),
- 'fieldsnames' => array('alwaysHTML5', 'html5priority', 'flashBlockedWait', 'mobileNavigationType', '|', 'rasterizePages', 'vectorPages', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', 'menuBreakpoint', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks'));
+ 'fieldsnames' => array('alwaysHTML5', 'html5priority', 'flashBlockedWait', 'mobileNavigationType', '|', 'rasterizePages', 'vectorPages', '|', 'mobileNavScale', '|', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', 'menuBreakpoint', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks'));
$this->fields['phonegapId'] = array('type' => 'text', 'default' => 'com.fluidbook.phonegap.$id', 'editable' => true, 'label' => __("Identifiant de l'identifiant"), 'grade' => 5, 'hint' => __('De la forme') . ' com.fluidbook.phonegap.xxxxx');
public $maxRes = 300;
public $jsFiles = array(
+ 'js/libs/cube/util.js',
'js/libs/modernizr/modernizr.min.js',
'js/libs/modernizr/tests.js',
'js/libs/threejs/three.min.js',
}
$this->vdir->copyDirectory($this->assets . '/js/libs/fluidbook/workers', 'js/libs/fluidbook/workers');
$this->vdir->copyDirectory($this->assets . '/js/libs/stand', 'js/libs/stand');
+ $this->vdir->copyDirectory($this->assets . '/js/libs/polyfills', 'js/libs/polyfills');
}
public function writeTexts()
break;
}
+ $rasterizePages = $this->config->rasterizePages;
+
$thumbs = array();
foreach ($this->pages as $page => $infos) {
$docdir = wsDocument::getDir($infos['document_id']);
- if ($this->svg) {
+
+ $thisrasterize = in_array($page, $rasterizePages);
+ $thisimagesvg = !$thisrasterize && $this->svg;
+ $thisbackgroundPrefix = $thisrasterize ? ['t'] : $this->backgroundsPrefix;
+
+ if ($thisimagesvg) {
$full = $docdir . 'html/fp' . $infos['document_page'] . '.svg';
$fullopt = $docdir . 'html/fo' . $infos['document_page'] . '%s.svg';
$orig = $docdir . 'html/tp' . $infos['document_page'] . '.svg';
}
foreach ($this->getResolutions() as $r) {
- foreach ($this->backgroundsPrefix as $backgroundsPrefix) {
+ foreach ($thisbackgroundPrefix as $backgroundsPrefix) {
$srcPrefix = $backgroundsPrefix;
if ($backgroundsPrefix == 'p') {
$srcPrefix = 'h';
$destination_css = $tmp . '/' . $f . '.css';
if (!file_exists($source_less)) {
+ die($source_less);
continue;
}
class wsHTML5Compiler
{
public static $resolutions = array(150, 300);
+ public $maxRes = 300;
public $jsFiles = array(
+ 'js/libs/cube/util.js',
'js/libs/modernizr/modernizr.min.js',
'js/libs/modernizr/tests.js',
- 'js/libs/cookie.min.js',
+ 'js/libs/threejs/three.min.js',
+ 'js/libs/threejs/Projector.js',
+ 'js/libs/threejs/CanvasRenderer.js',
+ 'js/libs/threejs/modifier.js',
+ 'js/libs/threejs/stats.js',
'js/libs/cube/fb.js',
'js/libs/cube/util.js',
'js/libs/screenfull.min.js',
'js/libs/mmenu/jquery.mmenu.offcanvas.min.js',
'js/libs/gsap/TweenMax.min.js',
'js/libs/gsap/jquery.gsap.min.js',
+ 'js/libs/threejs/Tweenmax.threejs.js',
'js/libs/gal/gal.js',
'js/libs/gal/gal.filesystem.js',
'js/libs/hammer.min.js',
'js/libs/fluidbook/fluidbook.share.js',
'js/libs/fluidbook/fluidbook.l10n.js',
'js/libs/fluidbook/fluidbook.slider.js',
+ 'js/libs/fluidbook/fluidbook.pagetransitions.js',
'js/libs/fluidbook/fluidbook.nav.js',
'js/libs/fluidbook/fluidbook.interface.js',
'js/libs/fluidbook/fluidbook.touch.js',
'js/libs/fluidbook/fluidbook.sound.js',
'js/libs/fluidbook/fluidbook.contentlock.js',
'js/libs/fluidbook/fluidbook.scorm.js',
+ 'js/libs/fluidbook/fluidbook.3dflip.js',
'js/libs/fluidbook/menu/fluidbook.chapters.js',
'js/libs/fluidbook/menu/fluidbook.index.js',
'js/libs/fluidbook/fluidbook.landingpage.js',
$this->phonegap = $phonegap;
$this->standalone = $standalone || $this->phonegap;
$this->appcache = $appcache;
+ $this->widget = !$this->phonegap;
cubePHP::set_memory('4G');
if ($this->phonegap) {
$this->vdir->copy(WS_COMPILE_ASSETS . '/_html5/js/libs/phonegap/' . $this->phonegapVersion . '/cordova-' . $this->phonegap . '.js', 'data/cordova.js');
}
-
+ $this->vdir->copyDirectory($this->assets . '/js/libs/fluidbook/workers', 'js/libs/fluidbook/workers');
+ $this->vdir->copyDirectory($this->assets . '/js/libs/stand', 'js/libs/stand');
+ $this->vdir->copyDirectory($this->assets . '/js/libs/polyfills', 'js/libs/polyfills');
}
public function writeTexts()
projects / cubeextranet.git / commitdiff