Ticket #1249

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -1978,7 +1978,6 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
 
         list($sSystem, $iObjectId) = $mixedScores;
         $oScore = $this->getScoreObject($sSystem, $iObjectId);
-        $oScore->addCssJs();
 
         $bResult = true;
 
@@ -1997,7 +1996,6 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
 
         list($sSystem, $iObjectId) = $mixedReports;
         $oReport = $this->getReportObject($sSystem, $iObjectId);
-        $oReport->addCssJs();
 
         $bResult = true;
 

template/scripts/BxBaseCmts.php

@@ -32,13 +32,6 @@ class BxBaseCmts extends BxDolCmts
      */
     public function addCssJs ()
     {
-        /*
-         * TODO: Remove after testing (Ticket #1249)
-         * 
-        $this->_oTemplate->addCss(array('cmts.css'));
-        $this->_oTemplate->addJs(array('jquery.anim.js', 'jquery.form.min.js', 'BxDolCmts.js'));
-        */
-
         $oForm = BxDolForm::getObjectInstance($this->_sFormObject, $this->_sFormDisplayPost);
         $oForm->addCssJs();
     }

template/scripts/BxBaseFavorite.php

@@ -62,20 +62,6 @@ class BxBaseFavorite extends BxDolFavorite
             self::$_sTmplContentDoFavoriteLabel = $this->_oTemplate->getHtml('favorite_do_favorite_label.html');
     }
 
-    /*
-     * TODO: Remove after testing (Ticket #1249)
-     */
-    public function addCssJs($bDynamicMode = false)
-    {
-    	if($bDynamicMode || $this->_bCssJsAdded)
-    		return;
-
-    	$this->_oTemplate->addJs(array('jquery.anim.js', 'BxDolFavorite.js'));
-        $this->_oTemplate->addCss(array('favorite.css'));
-
-        $this->_bCssJsAdded = true;
-    }
-
     public function getJsObjectName()
     {
         return $this->_sJsObjName;
@@ -92,23 +78,8 @@ class BxBaseFavorite extends BxDolFavorite
             'sStylePrefix' => $this->_sStylePrefix,
             'aHtmlIds' => $this->_aHtmlIds
         );
-        $sCode = $this->_sJsObjName . " = new " . $this->_sJsObjClass . "(" . json_encode($aParams) . ");";
-
-        /*
-         * TODO: Remove after testing (Ticket #1249)
-         * 
-        if($bDynamicMode) {
-			$sCode = "var " . $this->_sJsObjName . " = null; 
-			$.getScript('" . bx_js_string($this->_oTemplate->getJsUrl('BxDolFavorite.js'), BX_ESCAPE_STR_APOS) . "', function(data, textStatus, jqxhr) {
-				bx_get_style('" . bx_js_string($this->_oTemplate->getCssUrl('favorite.css'), BX_ESCAPE_STR_APOS) . "');
-				" . $sCode . "
-        	}); ";
-        }
-        else
-        	$sCode = "var " . $sCode;
+        $sCode = "var " . $this->_sJsObjName . " = new " . $this->_sJsObjClass . "(" . json_encode($aParams) . ");";
 
-        $this->addCssJs($bDynamicMode);
-        */
         return $this->_oTemplate->_wrapInTagJsCode($sCode);
     }
 

template/scripts/BxBaseFeature.php

@@ -59,20 +59,6 @@ class BxBaseFeature extends BxDolFeature
             self::$_sTmplContentDoFeatureLabel = $this->_oTemplate->getHtml('feature_do_feature_label.html');
     }
 
-    /*
-     * TODO: Remove after testing (Ticket #1249)
-     */
-    public function addCssJs($bDynamicMode = false)
-    {
-    	if($bDynamicMode || $this->_bCssJsAdded)
-    		return;
-
-    	$this->_oTemplate->addJs(array('jquery.anim.js', 'BxDolFeature.js'));
-        $this->_oTemplate->addCss(array('feature.css'));
-
-        $this->_bCssJsAdded = true;
-    }
-
     public function getJsObjectName()
     {
         return $this->_sJsObjName;
@@ -89,23 +75,8 @@ class BxBaseFeature extends BxDolFeature
             'sStylePrefix' => $this->_sStylePrefix,
             'aHtmlIds' => $this->_aHtmlIds
         );
-        $sCode = $this->_sJsObjName . " = new " . $this->_sJsObjClass . "(" . json_encode($aParams) . ");";
-
-        /*
-         * TODO: Remove after testing (Ticket #1249)
-         *
-        if($bDynamicMode) {
-			$sCode = "var " . $this->_sJsObjName . " = null; 
-			$.getScript('" . bx_js_string($this->_oTemplate->getJsUrl('BxDolFeature.js'), BX_ESCAPE_STR_APOS) . "', function(data, textStatus, jqxhr) {
-				bx_get_style('" . bx_js_string($this->_oTemplate->getCssUrl('feature.css'), BX_ESCAPE_STR_APOS) . "');
-				" . $sCode . "
-        	}); ";
-        }
-        else
-        	$sCode = "var " . $sCode;
-
-        $this->addCssJs($bDynamicMode);
-        */
+        $sCode = "var " . $this->_sJsObjName . " = new " . $this->_sJsObjClass . "(" . json_encode($aParams) . ");";
+
         return $this->_oTemplate->_wrapInTagJsCode($sCode);
     }
 

template/scripts/BxBaseReport.php

@@ -68,20 +68,6 @@ class BxBaseReport extends BxDolReport
             self::$_sTmplContentDoReportLabel = $this->_oTemplate->getHtml('report_do_report_label.html');
     }
 
-    /**
-     * TODO: Remove after testing (Ticket #1249)
-     */
-    public function addCssJs($bDynamicMode = false)
-    {
-    	if($bDynamicMode || $this->_bCssJsAdded)
-    		return;
-
-    	$this->_oTemplate->addJs(array('jquery.form.min.js', 'jquery.anim.js', 'BxDolReport.js'));
-        $this->_oTemplate->addCss(array('report.css'));
-
-        $this->_bCssJsAdded = true;
-    }
-
     public function getJsObjectName()
     {
         return $this->_sJsObjName;
@@ -98,23 +84,8 @@ class BxBaseReport extends BxDolReport
             'sStylePrefix' => $this->_sStylePrefix,
             'aHtmlIds' => $this->_aHtmlIds
         );
-        $sCode = $this->_sJsObjName . " = new " . $this->_sJsObjClass . "(" . json_encode($aParams) . ");";
-
-        /*
-         * TODO: Remove after testing (Ticket #1249)
-         * 
-        if($bDynamicMode) {
-			$sCode = "var " . $this->_sJsObjName . " = null; 
-			$.getScript('" . bx_js_string($this->_oTemplate->getJsUrl('BxDolReport.js'), BX_ESCAPE_STR_APOS) . "', function(data, textStatus, jqxhr) {
-				bx_get_style('" . bx_js_string($this->_oTemplate->getCssUrl('report.css'), BX_ESCAPE_STR_APOS) . "');
-				" . $sCode . "
-        	}); ";
-        }
-        else
-        	$sCode = "var " . $sCode;
+        $sCode = "var " . $this->_sJsObjName . " = new " . $this->_sJsObjClass . "(" . json_encode($aParams) . ");";
 
-        $this->addCssJs($bDynamicMode);
-        */
         return $this->_oTemplate->_wrapInTagJsCode($sCode);
     }
 

template/scripts/BxBaseScore.php

@@ -67,20 +67,6 @@ class BxBaseScore extends BxDolScore
             self::$_sTmplContentDoVoteLabel = $this->_oTemplate->getHtml('score_do_vote_label.html');
     }
 
-    /*
-     * TODO: Remove after testing (Ticket #1249)
-     */
-    public function addCssJs($bDynamicMode = false)
-    {
-    	if($bDynamicMode || $this->_bCssJsAdded)
-    		return;
-
-    	$this->_oTemplate->addJs(array('jquery.anim.js', 'BxDolScore.js'));
-        $this->_oTemplate->addCss(array('score.css'));
-
-        $this->_bCssJsAdded = true;
-    }
-
     public function getJsObjectName()
     {
         return $this->_sJsObjName;
@@ -100,23 +86,8 @@ class BxBaseScore extends BxDolScore
             'sStylePrefix' => $this->_sStylePrefix,
             'aHtmlIds' => $this->_aHtmlIds
         );
-        $sCode = $this->_sJsObjName . " = new BxDolScore(" . json_encode($aParamsJs) . ");";
-
-        /*
-         * TODO: Remove after testing (Ticket #1249)
-         *
-        if($bDynamicMode) {
-			$sCode = "var " . $this->_sJsObjName . " = null; 
-			$.getScript('" . bx_js_string($this->_oTemplate->getJsUrl('BxDolScore.js'), BX_ESCAPE_STR_APOS) . "', function(data, textStatus, jqxhr) {
-				bx_get_style('" . bx_js_string($this->_oTemplate->getCssUrl('score.css'), BX_ESCAPE_STR_APOS) . "');
-				" . $sCode . "
-        	}); ";
-        }
-        else
-        	$sCode = "var " . $sCode;
+        $sCode = "var " . $this->_sJsObjName . " = new BxDolScore(" . json_encode($aParamsJs) . ");";
 
-        $this->addCssJs($bDynamicMode);
-        */
         return $this->_oTemplate->_wrapInTagJsCode($sCode);
     }
 

template/scripts/BxBaseView.php

@@ -65,20 +65,6 @@ class BxBaseView extends BxDolView
         $this->_sTmplNameByList = 'view_by_list.html';
     }
 
-    /*
-     * TODO: Remove after testing (Ticket #1249)
-     */
-    public function addCssJs($bDynamicMode = false)
-    {
-    	if($bDynamicMode || $this->_bCssJsAdded)
-    		return;
-
-    	$this->_oTemplate->addJs(array('jquery.anim.js', 'BxDolView.js'));
-        $this->_oTemplate->addCss(array('view.css'));
-
-        $this->_bCssJsAdded = true;
-    }
-
     public function getJsObjectName()
     {
         return $this->_sJsObjName;
@@ -95,23 +81,8 @@ class BxBaseView extends BxDolView
             'sStylePrefix' => $this->_sStylePrefix,
             'aHtmlIds' => $this->_aHtmlIds
         );
-        $sCode = $this->_sJsObjName . " = new BxDolView(" . json_encode($aParams) . ");";
-
-        /*
-         * TODO: Remove after testing (Ticket #1249)
-         *
-        if($bDynamicMode) {
-			$sCode = "var " . $this->_sJsObjName . " = null; 
-			$.getScript('" . bx_js_string($this->_oTemplate->getJsUrl('BxDolView.js'), BX_ESCAPE_STR_APOS) . "', function(data, textStatus, jqxhr) {
-				bx_get_style('" . bx_js_string($this->_oTemplate->getCssUrl('view.css'), BX_ESCAPE_STR_APOS) . "');
-				" . $sCode . "
-        	}); ";
-        }
-        else
-        	$sCode = "var " . $sCode;
+        $sCode = "var " . $this->_sJsObjName . " = new BxDolView(" . json_encode($aParams) . ");";
 
-        $this->addCssJs($bDynamicMode);
-        */
         return $this->_oTemplate->_wrapInTagJsCode($sCode);
     }
 

template/scripts/BxBaseVote.php

@@ -79,20 +79,6 @@ class BxBaseVote extends BxDolVote
             self::$_sTmplContentDoVoteLikesLabel = $this->_oTemplate->getHtml('vote_do_vote_likes_label.html');
     }
 
-    /*
-     * TODO: Remove after testing (Ticket #1249)
-     */
-    public function addCssJs($bDynamicMode = false)
-    {
-    	if($bDynamicMode || $this->_bCssJsAdded)
-    		return;
-
-    	$this->_oTemplate->addJs(array('jquery.anim.js', 'BxDolVote.js'));
-        $this->_oTemplate->addCss(array('vote.css'));
-
-        $this->_bCssJsAdded = true;
-    }
-
     public function getJsObjectName()
     {
         return $this->_sJsObjName;
@@ -110,23 +96,8 @@ class BxBaseVote extends BxDolVote
             'sStylePrefix' => $this->_sStylePrefix,
             'aHtmlIds' => $this->_aHtmlIds
         );
-        $sCode = $this->_sJsObjName . " = new BxDolVote(" . json_encode($aParams) . ");";
-
-        /*
-         * TODO: Remove after testing (Ticket #1249)
-         *
-        if($bDynamicMode) {
-			$sCode = "var " . $this->_sJsObjName . " = null; 
-			$.getScript('" . bx_js_string($this->_oTemplate->getJsUrl('BxDolVote.js'), BX_ESCAPE_STR_APOS) . "', function(data, textStatus, jqxhr) {
-				bx_get_style('" . bx_js_string($this->_oTemplate->getCssUrl('vote.css'), BX_ESCAPE_STR_APOS) . "');
-				" . $sCode . "
-        	}); ";
-        }
-        else
-        	$sCode = "var " . $sCode;
+        $sCode = "var " . $this->_sJsObjName . " = new BxDolVote(" . json_encode($aParams) . ");";
 
-        $this->addCssJs($bDynamicMode);
-        */
         return $this->_oTemplate->_wrapInTagJsCode($sCode);
     }