Commit 87d22751e0c98cb83ed4c2c6bdec2bc35b4ee7da

Authored by Amrita Vishnoi
2 parents 65bffedf 8687ecfc

Merge branch 'Develop' into QA

400-SOURCECODE/AIAHTML5.Web/app/main/Link.js
1   -//----------------------------------------------------------------
2   -// Link class
3   -function link(modname,title, objurl, width, min_height) {
4   - this.modname = modname; // Module name (modname = Module Name)
5   - this.title = title;
6   - this.objurl = objurl;
7   - this.objstyle = {
8   - "width": width,
9   - "min-height": min_height
10   - };
  1 +//----------------------------------------------------------------
  2 +// Link class
  3 +function link(modname,title, objurl, width, min_height) {
  4 + this.modname = modname; // Module name (modname = Module Name)
  5 + this.title = title;
  6 + this.objurl = objurl;
  7 + this.objstyle = {
  8 + "width": width,
  9 + //"min-height": min_height
  10 + };
11 11 }
12 12 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
1   -<div class="bodyWrap row ">
2   - <div ng-include="'app/widget/MainMenu.html'" />
3   - <div class="main" style="min-height:750px;">
4   - <div id="siteloader" class="col-sm-12">
5   - <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>-->
6   - <object ng-style="myObj" type="text/html" data={{objdata}}></object>
7   - </div>
8   - </div>
9   -</div>
  1 +<div class="bodyWrap row ">
  2 + <div ng-include="'app/widget/MainMenu.html'" />
  3 + <div class="main" style="min-height:750px;">
  4 + <div id="siteloader" class="col-sm-12">
  5 + <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>-->
  6 + <object id="externalLink" ng-style="myObj" type="text/html" data={{objdata}}></object>
  7 + </div>
  8 + </div>
  9 +</div>
... ...