Skip to content

Commit 6d01d38

Browse files
DanielHindiDanielHindi
authored
Merge pull request #74 from rishabhdixit/master
show/hide text on plugin image issue of savings fixed
2 parents d6646b6 + 25aa9c6 commit 6d01d38

File tree

4 files changed

+30
-18
lines changed

4 files changed

+30
-18
lines changed

‎control/content/content.controller.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ folderPluginApp.controller('folderPluginCtrl', ['$scope', function ($scope) {
9090
updateMasterItem(updateItem);
9191
$scope.data = angular.copy(updateItem);
9292
}
93-
if(angular.isUndefined($scope.data.design.hideText)){
94-
$scope.data.design.hideText = Boolean(false);
95-
}
96-
9793
if (tmrDelay) clearTimeout(tmrDelay);
9894
}
9995

‎control/design/design.controller.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ folderPluginApp.controller('folderPluginCtrl', ['$scope', function ($scope) {
4444
hideText : false
4545
};
4646
}
47-
if(angular.isUndefined($scope.data.design.hideText)){
48-
$scope.data.design.hideText = Boolean(false);
49-
}
5047
}
5148

5249
/*

‎control/design/index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@
6464
</div>
6565
<div class="main col-md-9 pull-right" ng-init="data.design.hideText">
6666
<div class="radio radio-primary radio-inline">
67-
<input id="showText" type="radio" name="toggleText" ng-model="data.design.hideText" ng-value="false">
68-
<label for="showText">False</label>
67+
<input ng-if="data.design.hideText" id="showText" type="radio" name="toggleText" ng-model="data.design.hideText" ng-value="false">
68+
<input ng-if="!data.design.hideText" id="showText" type="radio" name="toggleText" checked="checked" >
69+
<label for="showText">False</label>
6970
</div>
7071
<div class="radio radio-primary radio-inline">
7172
<input id="hideText" type="radio" name="toggleText" ng-model="data.design.hideText" ng-value="true">

‎widget/index.html‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@
128128
</div>
129129
</div>
130130
<div class="padded text-left">
131-
<a class="text-primary" ng-if="data.design.hideText==false">{{ plugin.title }}</a>
131+
<a class="text-primary" ng-if="data.design.hideText!==undefined? !data.design.hideText : '' ">{{ plugin.title }}</a>
132+
<a class="text-primary" ng-if="data.design.hideText===undefined ? true : false ">{{ plugin.title }}</a>
132133
</div>
133134
</div>
134135
</div>
@@ -140,7 +141,10 @@
140141
<img load-image="16x9" data-final-src="{{ plugin.iconUrl }}" crop-width="450" crop-height="254" crop-type="crop" ng-if="plugin.iconUrl" />
141142
<img load-image="16x9" data-final-src="../../../styles/media/holder-16x9.png" ng-if="plugin.iconClassName" />
142143
</div>
143-
<div class="info-bar titleBarBackgroundTheme" ng-show="data.design.hideText==false">
144+
<div class="info-bar titleBarBackgroundTheme" ng-if="data.design.hideText!==undefined? !data.design.hideText: '' ">
145+
<p class="margin-bottom-zero col-md-12 ellipsis titleBarTextAndIcons">{{ plugin.title }}</p>
146+
</div>
147+
<div class="info-bar titleBarBackgroundTheme" ng-if="data.design.hideText===undefined ? true : false ">
144148
<p class="margin-bottom-zero col-md-12 ellipsis titleBarTextAndIcons">{{ plugin.title }}</p>
145149
</div>
146150
</div>
@@ -156,7 +160,12 @@
156160
<img load-image="1x1" data-final-src="{{ plugin.iconUrl }}" crop-width="320" crop-height="320" crop-type="crop" ng-if="plugin.iconUrl" />
157161
<img load-image="1x1" data-final-src="../../../styles/media/holder-1x1.png" ng-if="plugin.iconClassName" />
158162
</div>
159-
<div class="info-bar titleBarBackgroundTheme" ng-show="data.design.hideText==false">
163+
<div class="info-bar titleBarBackgroundTheme" ng-if="data.design.hideText!==undefined? !data.design.hideText: '' ">
164+
<p class="margin-bottom-zero col-md-12 ellipsis titleBarTextAndIcons">
165+
{{ plugin.title }}
166+
</p>
167+
</div>
168+
<div class="info-bar titleBarBackgroundTheme" ng-if="data.design.hideText===undefined ? true : false ">
160169
<p class="margin-bottom-zero col-md-12 ellipsis titleBarTextAndIcons">
161170
{{ plugin.title }}
162171
</p>
@@ -179,7 +188,10 @@
179188
</div>
180189
<div class="list-item-copy text-center" ng-class="data.design.hideText==false?'with-text':'without-text'">
181190
<p class="ellipsis margin-zero text-primary">
182-
<a class="text-primary" ng-show="data.design.hideText==false">
191+
<a class="text-primary" ng-show="data.design.hideText==false">
192+
{{ plugin.title }}
193+
</a>
194+
<a class="text-primary" ng-if="data.design.hideText===undefined ? true : false ">
183195
{{ plugin.title }}
184196
</a>
185197
</p>
@@ -199,7 +211,10 @@
199211
<img load-image="239x1" data-final-src="{{plugin.iconUrl}}" crop-width="512" crop-height="210" crop-type="crop" ng-if="plugin.iconUrl">
200212
<img load-image="239x1" data-final-src="../../../styles/media/holder-239x1.png" ng-if="plugin.iconClassName" />
201213
</div>
202-
<div class="info-bar blackBackgroundTheme" ng-show="data.design.hideText==false">
214+
<div class="info-bar blackBackgroundTheme" ng-if="data.design.hideText!==undefined? !data.design.hideText: '' ">
215+
<p class="margin-bottom-zero col-md-12 ellipsis whiteTheme">{{ plugin.title }}</p>
216+
</div>
217+
<div class="info-bar blackBackgroundTheme" ng-if="data.design.hideText===undefined ? true : false ">
203218
<p class="margin-bottom-zero col-md-12 ellipsis whiteTheme">{{ plugin.title }}</p>
204219
</div>
205220
</div>
@@ -232,7 +247,8 @@
232247
<div class="backgroundLayer" style="background:url('{{ cropImage(plugin.iconUrl? plugin.iconUrl : '../../../styles/media/holder-16x9.png', {width: 640, height: 360}) }}');"></div>
233248
<img load-image="16x9" data-final-src="{{plugin.iconUrl}}" crop-width="640" crop-height="360" crop-type="crop" ng-if="plugin.iconUrl" />
234249
<img load-image="16x9" data-final-src="../../../styles/media/holder-16x9.png" ng-if="plugin.iconClassName" />
235-
<p class="ellipsis item-text whiteTheme text-center" ng-show="data.design.hideText==false">{{ plugin.title }}</p>
250+
<p class="ellipsis item-text whiteTheme text-center" ng-if="data.design.hideText!==undefined? !data.design.hideText: '' ">{{ plugin.title }}</p>
251+
<p class="ellipsis item-text whiteTheme text-center" ng-if="data.design.hideText===undefined ? true : false ">{{ plugin.title }}</p>
236252
</div>
237253
</div>
238254
</div>
@@ -246,8 +262,9 @@
246262
<div class="backgroundLayer" style="background:url('{{ cropImage(plugin.iconUrl? plugin.iconUrl : '../../../styles/media/holder-4x1.png', {width: 640, height: 160}) }}');"></div>
247263
<img load-image="4x1" data-final-src="{{plugin.iconUrl }}" crop-width="640" crop-height="160" crop-type="crop" ng-if="plugin.iconUrl" />
248264
<img load-image="4x1" data-final-src="../../../styles/media/holder-4x1.png" ng-if="plugin.iconClassName" />
249-
<p class="ellipsis item-text whiteTheme text-center" ng-show="data.design.hideText==false">{{ plugin.title }}</p>
250-
</div>
265+
<p class="ellipsis item-text whiteTheme text-center" ng-if="data.design.hideText!==undefined? !data.design.hideText: '' ">{{ plugin.title }}</p>
266+
<p class="ellipsis item-text whiteTheme text-center" ng-if="data.design.hideText===undefined ? true : false ">{{ plugin.title }}</p>
267+
</div>
251268
</div>
252269
</div>
253270
<!--End Layout 10 -->
@@ -259,7 +276,8 @@
259276
<img load-image="1x1" data-final-src="{{ plugin.iconUrl }}" crop-width="400" crop-height="400" crop-type="crop" ng-if="plugin.iconUrl" />
260277
<img load-image="1x1" data-final-src="../../../styles/media/holder-1x1.png" ng-if="plugin.iconClassName" />
261278
<div class="text-holder">
262-
<p class="item-text whiteTheme text-center" ng-show="data.design.hideText==false">{{ plugin.title }}</p>
279+
<p class="item-text whiteTheme text-center" ng-if="data.design.hideText!==undefined? !data.design.hideText: '' ">{{ plugin.title }}</p>
280+
<p class="item-text whiteTheme text-center" ng-if="data.design.hideText===undefined ? true : false ">{{ plugin.title }}</p>
263281
</div>
264282
</div>
265283
</div>

0 commit comments

Comments
 (0)