Fixed bug #12411: t3editor/codecompletion gifbuilder IMAGE type being treated as...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6321 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 37fc60b..f0d952f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        * Fixed bug #12409: t3editor/codecompletion objects still showed up after deleting (thanks to Christian Kartnig)
        * Fixed bug #12410: t3editor/codecompletion some properties got not listed (thanks to Stephan Petzl)
        * Fixed bug #10959: t3editor/codecompletion CC triggers with spaces in TS path (thanks to Christian Kartnig)
+       * Fixed bug #12411: t3editor/codecompletion gifbuilder IMAGE type being treated as cObj IMAGE (thanks to Stephan Petzl)
 
 2009-11-03  Ernesto Baschny  <ernst@cron-it.de>
 

diff --git a/typo3/sysext/t3editor/jslib/ts_codecompletion/tsparser.js b/typo3/sysext/t3editor/jslib/ts_codecompletion/tsparser.js
index 950e820..eb43102 100644 (file)
--- a/typo3/sysext/t3editor/jslib/ts_codecompletion/tsparser.js
+++ b/typo3/sysext/t3editor/jslib/ts_codecompletion/tsparser.js
@@ -424,7 +424,10 @@ var TsParser = function(tsRef,extTsObjTree){
                var treeNode = getTreeNode(path);
                // if we are inside a GIFBUILDER Object
                if(treeNode.parent != null && treeNode.parent.value == "GIFBUILDER" && value == "TEXT") {
-                       value = "IMGTEXT";
+                       value = "GB_TEXT";
+               }
+               if(treeNode.parent != null && treeNode.parent.value == "GIFBUILDER" && value == "IMAGE") {
+                       value = "GB_IMAGE";
                }
                // just override if it is a real objecttype
                if (tsRef.isType(value)) {

diff --git a/typo3/sysext/t3editor/tsref/tsref.xml b/typo3/sysext/t3editor/tsref/tsref.xml
index b486c42..26c95af 100644 (file)
--- a/typo3/sysext/t3editor/tsref/tsref.xml
+++ b/typo3/sysext/t3editor/tsref/tsref.xml
@@ -2009,7 +2009,7 @@ NOTE: You may experience that this doesn't work if you use reduceColors-option o
 ]]></default>
                </property>
        </type>
-       <type id="GB_ADJUST" extends="GifBuilderObj">
+       <type id="ADJUST" extends="GifBuilderObj">
                <property name="value" type="string">
                        <description><![CDATA[This lets you adjust the input-levels like in Photoshops "levels"-dialog. If you need to adjust gamma, look at the EFFECT-object.
 Example:
@@ -2027,7 +2027,7 @@ autoLevels: -
 ]]></default>
                </property>
        </type>
-       <type id="GB_BOX" extends="GifBuilderObj">
+       <type id="BOX" extends="GifBuilderObj">
                <property name="align" type="string">
                        <description><![CDATA[VHalign
 ]]></description>
@@ -2048,7 +2048,7 @@ w,h    is the dimensions. Dimensions of 1 will result in 1-pixel wide lines!]]
 ]]></default>
                </property>
        </type>
-       <type id="GB_CROP" extends="GifBuilderObj">
+       <type id="CROP" extends="GifBuilderObj">
                <property name="align" type="string">
                        <description><![CDATA[VHalign
 ]]></description>
@@ -2068,7 +2068,7 @@ v,h  is the dimensions]]></description>
 ]]></default>
                </property>
        </type>
-       <type id="GB_EFFECT" extends="GifBuilderObj">
+       <type id="EFFECT" extends="GifBuilderObj">
                <property name="value" type="string">
                        <description><![CDATA[.value = [Varnavn] = [value] | [Varnavn] = [value]
 
@@ -2098,7 +2098,7 @@ invert: - (invert the colors)
 ]]></default>
                </property>
        </type>
-       <type id="GB_EMBOSS" extends="GifBuilderObj">
+       <type id="EMBOSS" extends="GifBuilderObj">
                <property name="blur" type="int">
                        <description><![CDATA[posint (1-99)
                        Blurring of the shadow. Above 40 only values of 40,50,60,70,80,90 means something.]]></description>
@@ -2174,7 +2174,7 @@ Maximum times is 20 each direction. If you need more, use a larger image.]]></de
 ]]></default>
                </property>
        </type>
-       <type id="GB_OUTLINE" extends="GifBuilderObj">
+       <type id="OUTLINE" extends="GifBuilderObj">
                <property name="color" type="string">
                        <description><![CDATA[GraphicColor
                        Outline color]]></description>
@@ -2195,7 +2195,7 @@ If - on the other hand - the shadow is a property to a text-object, this propert
 ]]></default>
                </property>
        </type>
-       <type id="GB_SCALE" extends="GifBuilderObj">
+       <type id="SCALE" extends="GifBuilderObj">
                <property name="height" type="string">
                        <description><![CDATA[pixels + calc
 ]]></description>
@@ -2215,7 +2215,7 @@ If - on the other hand - the shadow is a property to a text-object, this propert
 ]]></default>
                </property>
        </type>
-       <type id="GB_SHADOW" extends="GifBuilderObj">
+       <type id="SHADOW" extends="GifBuilderObj">
                <property name="blur" type="int">
                        <description><![CDATA[posint (1-99)
                        Blurring of the shadow. Above 40 only values of 40,50,60,70,80,90 means something.
@@ -2281,7 +2281,7 @@ Note: This option is not available if .niceText is enabled]]></description>
                        <description><![CDATA[If set, HTML-tags in the string inserted are NOT removed. Any other way HTML-code is removed by default!]]></description>
                        <default><![CDATA[0]]></default>
                </property>
-               <property name="emboss" type="GB_EMBOSS">
+               <property name="emboss" type="EMBOSS">
                        <description><![CDATA[
 ]]></description>
                        <default><![CDATA[
@@ -2352,13 +2352,13 @@ Some properties:
                        Offset of the text]]></description>
                        <default><![CDATA[0,0]]></default>
                </property>
-               <property name="outline" type="GB_OUTLINE">
+               <property name="outline" type="OUTLINE">
                        <description><![CDATA[
 ]]></description>
                        <default><![CDATA[
 ]]></default>
                </property>
-               <property name="shadow" type="GB_SHADOW">
+               <property name="shadow" type="SHADOW">
                        <description><![CDATA[
 ]]></description>
                        <default><![CDATA[
@@ -2475,7 +2475,7 @@ The cObj->data-array is loaded with the page-record, if for example the GIFBUILD
                        <default><![CDATA[= ".spacing"*2]]></default>
                </property>
        </type>
-       <type id="GB_WORKAREA" extends="GifBuilderObj">
+       <type id="WORKAREA" extends="GifBuilderObj">
                <property name="clear" type="string">(isset)
                        <description><![CDATA[
 ]]></description>